fix(message-parser): Escaping only necessary characters (#899)

RocketChat · Nov 10, 2022 · 29dd497 · 29dd497
1 parent aa9bc06
commit 29dd497
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs
@@ -149,7 +149,7 @@ Inline
 
 Whitespace = w:$" "+ { return plain(w); }
 
-Escaped = "\\" t:$. { return plain(t); }
+Escaped = "\\" t:$("*" / "_" / "~" / "`" / "#" / ".") { return plain(t); }
 
 Any = !EndOfLine t:$. u:$URL? { return plain(t + u); }
 
@@ -297,10 +297,6 @@ unicode
       return String.fromCharCode(parseInt(digits, 16));
     }
 
-escape
-  = unicode
-  / "\\" ch:[^\r\n\f0-9a-f]i { return ch; }
-
 AutolinkedPhone = p:Phone { return link('tel:' + p.number, plain(p.text)); }
 
 AutolinkedURL = u:URL { return link(u); }

diff --git a/packages/message-parser/tests/escaped.test.ts b/packages/message-parser/tests/escaped.test.ts
@@ -2,7 +2,7 @@ import { parse } from '../src';
 import { paragraph, plain, bold } from '../src/utils';
 
 test.each([
-  ['¯\\\\\\_(ツ)_/¯', [paragraph([plain('¯\\_(ツ)_/¯')])]],
+  ['¯\\\\_(ツ)_/¯', [paragraph([plain('¯\\_(ツ)_/¯')])]],
   [
     '\\*escaped as*bold*escaped*',
     [
@@ -14,24 +14,24 @@ test.each([
     ],
   ],
   ['\\*not bold*', [paragraph([plain('*not bold*')])]],
+  ['*_~`#.'.split('').join('\\'), [paragraph([plain('*_~`#.')])]],
+  ['\\*not emphasized*', [paragraph([plain('*not emphasized*')])]],
+  ['\\<br/> tag plain text', [paragraph([plain('\\<br/> tag plain text')])]],
   [
-    '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'.split('').join('\\'),
-    [paragraph([plain('!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~')])],
+    '\\[it is not a link](/foo)',
+    [paragraph([plain('\\[it is not a link](/foo)')])],
   ],
-  ['\\*not emphasized*', [paragraph([plain('*not emphasized*')])]],
-  ['\\<br/> not a tag', [paragraph([plain('<br/> not a tag')])]],
-  ['\\[not a link](/foo)', [paragraph([plain('[not a link](/foo)')])]],
   ['\\`not code`', [paragraph([plain('`not code`')])]],
   ['1\\. not a list', [paragraph([plain('1. not a list')])]],
   ['\\* not a list', [paragraph([plain('* not a list')])]],
   ['\\# not a heading', [paragraph([plain('# not a heading')])]],
   [
     '\\[foo]: /url "not a reference"',
-    [paragraph([plain('[foo]: /url "not a reference"')])],
+    [paragraph([plain('\\[foo]: /url "not a reference"')])],
   ],
   [
     '\\&ouml; not a character entity',
-    [paragraph([plain('&ouml; not a character entity')])],
+    [paragraph([plain('\\&ouml; not a character entity')])],
   ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);