fix: improve hostapd checker (#4368)

ffontaine · web-flow · commit f51f40f39079 · 2024-08-20T10:40:30.000-07:00
Update hostapd pattern to avoid raising a wrong version of 1.100 with
some proprietary binary which defines the following strings:

192.168.1.100
hostapd_ctrl_interface

Signed-off-by: Fabrice Fontaine &lt;fabrice.fontaine@orange.com&gt;
diff --git a/cve_bin_tool/checkers/hostapd.py b/cve_bin_tool/checkers/hostapd.py
@@ -19,6 +19,6 @@ class HostapdChecker(Checker):
     FILENAME_PATTERNS = [r"hostapd"]
     VERSION_PATTERNS = [
         r"\nhostapd[_a-z]* v([0-9]+\.[0-9]+)",
-        r"([0-9]+\.[0-9]+)[a-z-]*\r?\nhostapd",
+        r"([0-9]+\.[0-9]+)[a-z-]*\r?\nhostapd[_a-z]* v",
     ]
     VENDOR_PRODUCT = [("w1.fi", "hostapd")]
diff --git a/test/test_data/hostapd.py b/test/test_data/hostapd.py
@@ -6,7 +6,7 @@
     {
         "product": "hostapd",
         "version": "2.10",
-        "version_strings": ["2.10-devel\nhostapd"],
+        "version_strings": ["2.10-devel\nhostapd v"],
     },
 ]
 package_test_data = [

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ class HostapdChecker(Checker):`
`19`	`19`	`FILENAME_PATTERNS = [r"hostapd"]`
`20`	`20`	`VERSION_PATTERNS = [`
`21`	`21`	`r"\nhostapd[_a-z]* v([0-9]+\.[0-9]+)",`
`22`		`- r"([0-9]+\.[0-9]+)[a-z-]*\r?\nhostapd",`
	`22`	`+ r"([0-9]+\.[0-9]+)[a-z-]\r?\nhostapd[_a-z] v",`
`23`	`23`	`]`
`24`	`24`	`VENDOR_PRODUCT = [("w1.fi", "hostapd")]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`"product": "hostapd",`
`8`	`8`	`"version": "2.10",`
`9`		`- "version_strings": ["2.10-devel\nhostapd"],`
	`9`	`+ "version_strings": ["2.10-devel\nhostapd v"],`
`10`	`10`	`},`
`11`	`11`	`]`
`12`	`12`	`package_test_data = [`