Merge pull request #519 from progfay/fix-decorationRegExp-ReDos

progfay · Feb 7, 2021 · 47e1706 · 47e1706
2 parents 1a2e78d + 75f1fa6
commit 47e1706
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 1 deletion.
diff --git a/src/block/node/DecorationNode.ts b/src/block/node/DecorationNode.ts
@@ -4,7 +4,7 @@ import { convertToNodes } from '.'
 import type { DecorationNode } from './type'
 import type { NodeCreator } from './creator'
 
-const decorationRegExp = /\[[!"#%&'()*+,-./{|}<>_~]+ (?:\[[^\]]+\]|[^\]])+\]/
+const decorationRegExp = /\[[!"#%&'()*+,-./{|}<>_~]+ (?:\[[^[\]]+\]|[^\]])+\]/
 
 type DecorationChar =
   | '*'

diff --git a/tests/line/__snapshots__/decoration.test.ts.snap b/tests/line/__snapshots__/decoration.test.ts.snap
@@ -59,6 +59,59 @@ Array [
 ]
 `;
 
+exports[`decoration Decoration with many [ and link: toMatchSnapshotWhenParsing 1`] = `
+Array [
+  Object {
+    "indent": 0,
+    "nodes": Array [
+      Object {
+        "raw": "[! ",
+        "text": "[! ",
+        "type": "plain",
+      },
+      Object {
+        "nodes": Array [
+          Object {
+            "raw": "[[[[a",
+            "text": "[[[[a",
+            "type": "plain",
+          },
+        ],
+        "raw": "[[[[[[a]]",
+        "type": "strong",
+      },
+    ],
+    "type": "line",
+  },
+]
+`;
+
+exports[`decoration Decoration with many [: toMatchSnapshotWhenParsing 1`] = `
+Array [
+  Object {
+    "indent": 0,
+    "nodes": Array [
+      Object {
+        "decos": Array [
+          "!",
+        ],
+        "nodes": Array [
+          Object {
+            "raw": "[[[[[[a",
+            "text": "[[[[[[a",
+            "type": "plain",
+          },
+        ],
+        "raw": "[! [[[[[[a]",
+        "rawDecos": "!",
+        "type": "decoration",
+      },
+    ],
+    "type": "line",
+  },
+]
+`;
+
 exports[`decoration Simple decoration: toMatchSnapshotWhenParsing 1`] = `
 Array [
   Object {

diff --git a/tests/line/decoration.test.ts b/tests/line/decoration.test.ts
@@ -73,4 +73,12 @@ describe('decoration', () => {
       hasTitle: false
     })
   })
+
+  it('Decoration with many [', () => {
+    expect('[! [[[[[[a]').toMatchSnapshotWhenParsing({ hasTitle: false })
+  })
+
+  it('Decoration with many [ and link', () => {
+    expect('[! [[[[[[a]]').toMatchSnapshotWhenParsing({ hasTitle: false })
+  })
 })