fix: Improve FreeRDP detection logic (#4751)

qmfrederik · web-flow · commit 76993fad4469 · 2025-02-19T16:35:57.000-08:00
diff --git a/cve_bin_tool/checkers/freerdp.py b/cve_bin_tool/checkers/freerdp.py
@@ -19,5 +19,6 @@ class FreerdpChecker(Checker):
     VERSION_PATTERNS = [
         r"freerdp2-([0-9]+\.[0-9]+\.[0-9]+)",
         r"FreeRDP-([0-9]+\.[0-9]+\.[0-9]+)",
+        r"FreeRDP/([0-9]+\.[0-9]+\.[0-9]+)",
     ]
     VENDOR_PRODUCT = [("freerdp", "freerdp")]
diff --git a/test/condensed-downloads/libfreerdp3-3_3.10.3+dfsg-1_amd64.deb.tar.gz b/test/condensed-downloads/libfreerdp3-3_3.10.3+dfsg-1_amd64.deb.tar.gz
diff --git a/test/test_data/freerdp.py b/test/test_data/freerdp.py
@@ -4,6 +4,7 @@
 mapping_test_data = [
     {"product": "freerdp", "version": "2.8.1", "version_strings": ["FreeRDP-2.8.1"]},
     {"product": "freerdp", "version": "2.2.0", "version_strings": ["freerdp2-2.2.0"]},
+    {"product": "freerdp", "version": "3.5.1", "version_strings": ["FreeRDP/3.5.1"]},
 ]
 package_test_data = [
     {
@@ -18,4 +19,10 @@
         "product": "freerdp",
         "version": "2.0.0",
     },
+    {
+        "url": "http://ftp.debian.org/debian/pool/main/f/freerdp3/",
+        "package_name": "libfreerdp3-3_3.10.3+dfsg-1_amd64.deb",
+        "product": "freerdp",
+        "version": "3.10.3",
+    },
 ]

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ class FreerdpChecker(Checker):`
`19`	`19`	`VERSION_PATTERNS = [`
`20`	`20`	`r"freerdp2-([0-9]+\.[0-9]+\.[0-9]+)",`
`21`	`21`	`r"FreeRDP-([0-9]+\.[0-9]+\.[0-9]+)",`
	`22`	`+ r"FreeRDP/([0-9]+\.[0-9]+\.[0-9]+)",`
`22`	`23`	`]`
`23`	`24`	`VENDOR_PRODUCT = [("freerdp", "freerdp")]`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`mapping_test_data = [`
`5`	`5`	`{"product": "freerdp", "version": "2.8.1", "version_strings": ["FreeRDP-2.8.1"]},`
`6`	`6`	`{"product": "freerdp", "version": "2.2.0", "version_strings": ["freerdp2-2.2.0"]},`
	`7`	`+ {"product": "freerdp", "version": "3.5.1", "version_strings": ["FreeRDP/3.5.1"]},`
`7`	`8`	`]`
`8`	`9`	`package_test_data = [`
`9`	`10`	`{`
`@@ -18,4 +19,10 @@`
`18`	`19`	`"product": "freerdp",`
`19`	`20`	`"version": "2.0.0",`
`20`	`21`	`},`
	`22`	`+ {`
	`23`	`+ "url": "http://ftp.debian.org/debian/pool/main/f/freerdp3/",`
	`24`	`+ "package_name": "libfreerdp3-3_3.10.3+dfsg-1_amd64.deb",`
	`25`	`+ "product": "freerdp",`
	`26`	`+ "version": "3.10.3",`
	`27`	`+ },`
`21`	`28`	`]`