fix: Improve .NET detection (#4750)

qmfrederik · web-flow · commit 448c159b37b8 · 2025-02-20T12:32:19.000-08:00
diff --git a/cve_bin_tool/checkers/dotnet.py b/cve_bin_tool/checkers/dotnet.py
@@ -18,6 +18,7 @@ class DotnetChecker(Checker):
     FILENAME_PATTERNS: list[str] = []
     VERSION_PATTERNS: list[str] = [
         r"dotnet-v([0-9]+\.[0-9]+\.[0-9]{1,2})",
+        r"/([0-9]+\.[0-9]+\.[0-9]{1,2})\+[0-9a-f]{40}\r?\nMicrosoft\r?\n .NET\r?\n",
     ]
     VENDOR_PRODUCT: list[tuple[str, str]] = [
         ("microsoft", ".net"),
diff --git a/test/condensed-downloads/dotnet-runtime-8.0_8.0.12-0ubuntu1~24.10.1_amd64.deb.tar.gz b/test/condensed-downloads/dotnet-runtime-8.0_8.0.12-0ubuntu1~24.10.1_amd64.deb.tar.gz
diff --git a/test/test_data/dotnet.py b/test/test_data/dotnet.py
@@ -3,7 +3,14 @@
         "product": ".net",
         "version": "7.0.11",
         "version_strings": ["dotnet-v7.0.11"],
-    }
+    },
+    {
+        "product": ".net",
+        "version": "8.0.12",
+        "version_strings": [
+            "/8.0.12+89ef51c5d8f5239345127a1e282e11036e590c8b\nMicrosoft\n .NET\n"
+        ],
+    },
 ]
 
 package_test_data = [
@@ -14,4 +21,10 @@
         "package_name": "dotnet-runtime-7.0-7.0.11-1.fc39.aarch64.rpm",
         "other_products": ["clang"],
     },
+    {
+        "url": "http://security.ubuntu.com/ubuntu/pool/main/d/dotnet8/",
+        "package_name": "dotnet-runtime-8.0_8.0.12-0ubuntu1~24.10.1_amd64.deb",
+        "product": ".net",
+        "version": "8.0.12",
+    },
 ]

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ class DotnetChecker(Checker):`
`18`	`18`	`FILENAME_PATTERNS: list[str] = []`
`19`	`19`	`VERSION_PATTERNS: list[str] = [`
`20`	`20`	`r"dotnet-v([0-9]+\.[0-9]+\.[0-9]{1,2})",`
	`21`	`+ r"/([0-9]+\.[0-9]+\.[0-9]{1,2})\+[0-9a-f]{40}\r?\nMicrosoft\r?\n .NET\r?\n",`
`21`	`22`	`]`
`22`	`23`	`VENDOR_PRODUCT: list[tuple[str, str]] = [`
`23`	`24`	`("microsoft", ".net"),`