From a2d7e4a1191b671c41dd4857962a145eac172496 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 16 Mar 2023 02:21:41 +0000
Subject: [PATCH] import nodejs-nodemon-2.0.20-3.module+el8.7.0+18373+704f5cef

---
 ...-Resolve-ReDoS-vulnerability-from-CV.patch | 63 +++++++++++++++++++
 SPECS/nodejs-nodemon.spec                     | 10 ++-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/0001-deps-glob-parent-Resolve-ReDoS-vulnerability-from-CV.patch

diff --git a/SOURCES/0001-deps-glob-parent-Resolve-ReDoS-vulnerability-from-CV.patch b/SOURCES/0001-deps-glob-parent-Resolve-ReDoS-vulnerability-from-CV.patch
new file mode 100644
index 0000000..c838a4f
--- /dev/null
+++ b/SOURCES/0001-deps-glob-parent-Resolve-ReDoS-vulnerability-from-CV.patch
@@ -0,0 +1,63 @@
+From 62287c7af3aabd73db9bd1057c4c6cfcb5f3f67b Mon Sep 17 00:00:00 2001
+From: Takayuki Sato <sttk.xslet@gmail.com>
+Date: Tue, 20 Jul 2021 14:46:33 +0900
+Subject: [PATCH] deps(glob-parent): Resolve ReDoS vulnerability from
+ CVE-2021-35065 (#49)
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ node_modules/glob-parent/index.js | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/node_modules/glob-parent/index.js b/node_modules/glob-parent/index.js
+index 09e257e..b182190 100644
+--- a/node_modules/glob-parent/index.js
++++ b/node_modules/glob-parent/index.js
+@@ -6,7 +6,6 @@ var isWin32 = require('os').platform() === 'win32';
+ 
+ var slash = '/';
+ var backslash = /\\/g;
+-var enclosure = /[\{\[].*[\}\]]$/;
+ var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
+ var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
+ 
+@@ -25,7 +24,7 @@ module.exports = function globParent(str, opts) {
+   }
+ 
+   // special case for strings ending in enclosure containing path separator
+-  if (enclosure.test(str)) {
++  if (isEnclosure(str)) {
+     str += slash;
+   }
+ 
+@@ -40,3 +39,27 @@ module.exports = function globParent(str, opts) {
+   // remove escape chars and return result
+   return str.replace(escaped, '$1');
+ };
++
++
++function isEnclosure(str) {
++  var lastChar = str.slice(-1)
++
++  var enclosureStart;
++  switch (lastChar) {
++    case '}':
++      enclosureStart = '{';
++      break;
++    case ']':
++      enclosureStart = '[';
++      break;
++    default:
++      return false;
++  }
++
++  var foundIndex = str.indexOf(enclosureStart);
++  if (foundIndex < 0) {
++    return false;
++  }
++
++  return str.slice(foundIndex + 1, -1).includes(slash);
++}
+-- 
+2.39.2
+
diff --git a/SPECS/nodejs-nodemon.spec b/SPECS/nodejs-nodemon.spec
index 4292d46..a7c66b9 100644
--- a/SPECS/nodejs-nodemon.spec
+++ b/SPECS/nodejs-nodemon.spec
@@ -6,12 +6,14 @@
 
 Name:          nodejs-%{npm_name}
 Version:       2.0.20
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Simple monitor script for use during development of a node.js app
 License:       MIT
 URL:           https://www.npmjs.com/package/nodemon
 Source0:       %{npm_name}-v%{version}-bundled.tar.gz
 
+Patch1:        0001-deps-glob-parent-Resolve-ReDoS-vulnerability-from-CV.patch
+
 BuildRequires: nodejs-devel
 BuildRequires: nodejs-packaging
 BuildRequires: npm
@@ -47,7 +49,7 @@ replacement wrapper for node, think of it as replacing the word "node"
 on the command line when you run your script.
 
 %prep
-%setup -q -n package
+%autosetup -p1 -n package
 
 %build
 
@@ -73,6 +75,10 @@ npm run test
 %{_bindir}/nodemon
 
 %changelog
+* Mon Feb 27 2023 Jan Staněk <jstanek@redhat.com> - 2.0.20-3
+- Patch bundled glob-parent
+  Resolves: CVE-2021-35065
+
 * Fri Dec 02 2022 Jan Staněk <jstanek@redhat.com> - 2.0.20-1
 - Record CVE fixed in the current or previous upstream versions
   Resolves: CVE-2021-44906