fix: improve node signature (#2682)

Improve node signature to avoid catching the following string in node 14.16.0: // Compat. Before node v10.12.0 stdio used to throw an error so While at it, add debian and OpenWRT test packages Signed-off-by: Fabrice Fontaine <[email protected]>
intel · Feb 13, 2023 · 0e1971c · 0e1971c
1 parent f8333d7
commit 0e1971c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/cve_bin_tool/checkers/node.py b/cve_bin_tool/checkers/node.py
@@ -22,6 +22,6 @@ class NodeChecker(Checker):
     FILENAME_PATTERNS = [r"bin/node"]
     VERSION_PATTERNS = [
         r"https\:\/\/nodejs.org\/download\/release\/v([0-9]+\.[0-9]+\.[0-9]+)\/",
-        r"node v([0-9]+\.[0-9]+\.[0-9]+)",
+        r"(?:\r?\n|\/)node v([0-9]+\.[0-9]+\.[0-9]+)",
     ]
     VENDOR_PRODUCT = [("nodejs", "node.js")]
diff --git a/test/condensed-downloads/node_v8.16.1-1_x86_64.ipk.tar.gz b/test/condensed-downloads/node_v8.16.1-1_x86_64.ipk.tar.gz
diff --git a/test/condensed-downloads/nodejs_0.10.29~dfsg-2_amd64.deb.tar.gz b/test/condensed-downloads/nodejs_0.10.29~dfsg-2_amd64.deb.tar.gz
diff --git a/test/test_data/node.py b/test/test_data/node.py
@@ -5,7 +5,7 @@
     {
         "product": "node.js",
         "version": "9.3.0",
-        "version_strings": ["https://nodejs.org/download/release/v", "node v9.3.0 "],
+        "version_strings": ["https://nodejs.org/download/release/v", "/node v9.3.0 "],
     }
 ]
 package_test_data = [
@@ -15,5 +15,19 @@
         "product": "node.js",
         "version": "14.16.0",
         "other_products": ["openssl", "zlib"],
-    }
+    },
+    {
+        "url": "http://ftp.fr.debian.org/debian/pool/main/n/nodejs/",
+        "package_name": "nodejs_0.10.29~dfsg-2_amd64.deb",
+        "product": "node.js",
+        "version": "0.10.29",
+        "other_products": ["openssl"],
+    },
+    {
+        "url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",
+        "package_name": "node_v8.16.1-1_x86_64.ipk",
+        "product": "node.js",
+        "version": "8.16.1",
+        "other_products": ["nghttp2", "openssl"],
+    },
 ]