|
 |
8fb353 |
From 62287c7af3aabd73db9bd1057c4c6cfcb5f3f67b Mon Sep 17 00:00:00 2001
|
|
|
8fb353 |
From: Takayuki Sato <sttk.xslet@gmail.com>
|
|
|
8fb353 |
Date: Tue, 20 Jul 2021 14:46:33 +0900
|
|
|
8fb353 |
Subject: [PATCH] deps(glob-parent): Resolve ReDoS vulnerability from
|
|
|
8fb353 |
CVE-2021-35065 (#49)
|
|
|
8fb353 |
|
|
|
8fb353 |
Signed-off-by: rpm-build <rpm-build>
|
|
|
8fb353 |
---
|
|
|
8fb353 |
node_modules/glob-parent/index.js | 27 +++++++++++++++++++++++++--
|
|
|
8fb353 |
1 file changed, 25 insertions(+), 2 deletions(-)
|
|
|
8fb353 |
|
|
|
8fb353 |
diff --git a/node_modules/glob-parent/index.js b/node_modules/glob-parent/index.js
|
|
|
8fb353 |
index 09e257e..b182190 100644
|
|
|
8fb353 |
--- a/node_modules/glob-parent/index.js
|
|
|
8fb353 |
+++ b/node_modules/glob-parent/index.js
|
|
|
8fb353 |
@@ -6,7 +6,6 @@ var isWin32 = require('os').platform() === 'win32';
|
|
|
8fb353 |
|
|
|
8fb353 |
var slash = '/';
|
|
|
8fb353 |
var backslash = /\\/g;
|
|
|
8fb353 |
-var enclosure = /[\{\[].*[\}\]]$/;
|
|
|
8fb353 |
var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
|
|
|
8fb353 |
var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
|
|
|
8fb353 |
|
|
|
8fb353 |
@@ -25,7 +24,7 @@ module.exports = function globParent(str, opts) {
|
|
|
8fb353 |
}
|
|
|
8fb353 |
|
|
|
8fb353 |
// special case for strings ending in enclosure containing path separator
|
|
|
8fb353 |
- if (enclosure.test(str)) {
|
|
|
8fb353 |
+ if (isEnclosure(str)) {
|
|
|
8fb353 |
str += slash;
|
|
|
8fb353 |
}
|
|
|
8fb353 |
|
|
|
8fb353 |
@@ -40,3 +39,27 @@ module.exports = function globParent(str, opts) {
|
|
|
8fb353 |
// remove escape chars and return result
|
|
|
8fb353 |
return str.replace(escaped, '$1');
|
|
|
8fb353 |
};
|
|
|
8fb353 |
+
|
|
|
8fb353 |
+
|
|
|
8fb353 |
+function isEnclosure(str) {
|
|
|
8fb353 |
+ var lastChar = str.slice(-1)
|
|
|
8fb353 |
+
|
|
|
8fb353 |
+ var enclosureStart;
|
|
|
8fb353 |
+ switch (lastChar) {
|
|
|
8fb353 |
+ case '}':
|
|
|
8fb353 |
+ enclosureStart = '{';
|
|
|
8fb353 |
+ break;
|
|
|
8fb353 |
+ case ']':
|
|
|
8fb353 |
+ enclosureStart = '[';
|
|
|
8fb353 |
+ break;
|
|
|
8fb353 |
+ default:
|
|
|
8fb353 |
+ return false;
|
|
|
8fb353 |
+ }
|
|
|
8fb353 |
+
|
|
|
8fb353 |
+ var foundIndex = str.indexOf(enclosureStart);
|
|
|
8fb353 |
+ if (foundIndex < 0) {
|
|
|
8fb353 |
+ return false;
|
|
|
8fb353 |
+ }
|
|
|
8fb353 |
+
|
|
|
8fb353 |
+ return str.slice(foundIndex + 1, -1).includes(slash);
|
|
|
8fb353 |
+}
|
|
|
8fb353 |
--
|
|
|
8fb353 |
2.39.2
|
|
|
8fb353 |
|