Merge pull request #3 from Trott/patch-1

fix for CVE-2021-23425
stevemao · Sep 17, 2021 · fcbb73d · fcbb73d
2 parents 3a728c9 + 6d89476
commit fcbb73d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var regex = /^(?:\r\n|\n|\r)+|(?:\r\n|\n|\r)+$/g;
+var regex = /^(?:\r|\n)+|(?:\r|\n)+$/g;
 
 module.exports = function (str) {
 	return str.replace(regex, '');

diff --git a/package.json b/package.json
@@ -34,10 +34,9 @@
     "remove",
     "delete"
   ],
-  "dependencies": {},
   "devDependencies": {
     "mocha": "*",
-    "xo": "*"
+    "xo": "^0.17.1"
   },
   "xo": {
     "envs": [

diff --git a/test.js b/test.js
@@ -19,3 +19,10 @@ it('should trim off \\r\\n', function () {
 	assert.strictEqual(trimOffNewlines('\r\nunicorns\r\n'), 'unicorns');
 	assert.strictEqual(trimOffNewlines('unicorns\r\n\r\n\r\n\r\n\r\n\r\n'), 'unicorns');
 });
+
+it('should not be susceptible to exponential backtracking', function () {
+	var start = Date.now();
+	trimOffNewlines('a' + '\r\n'.repeat(1000) + 'a');
+	var end = Date.now();
+	assert.ok(end - start < 1000, 'took too long, probably susceptible to ReDOS');
+});