fix: improve wireshark checker

Improve wireshark checker to avoid returning strings such as 3.4.1 for version 3.4.10 While at it, also add a debian test package Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
intel · Feb 15, 2023 · 32fa611 · 32fa611
1 parent 93c110c
commit 32fa611
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cve_bin_tool/checkers/wireshark.py b/cve_bin_tool/checkers/wireshark.py
@@ -17,5 +17,5 @@ class WiresharkChecker(Checker):
         r"Are you a member of the 'wireshark' group\? Try running",
     ]
     FILENAME_PATTERNS = [r"rawshark", r"wireshark"]
-    VERSION_PATTERNS = [r"Wireshark ([0-9]+\.[0-9]+\.[0-9]+)"]
+    VERSION_PATTERNS = [r"Wireshark ([0-9]+\.[0-9]+\.[0-9]+)\."]
     VENDOR_PRODUCT = [("wireshark", "wireshark")]
diff --git a/test/condensed-downloads/libwireshark16_4.0.3-1_amd64.deb.tar.gz b/test/condensed-downloads/libwireshark16_4.0.3-1_amd64.deb.tar.gz
diff --git a/test/test_data/wireshark.py b/test/test_data/wireshark.py
@@ -5,7 +5,7 @@
     {
         "product": "wireshark",
         "version": "1.10.12",
-        "version_strings": ["Wireshark 1.10.12"],
+        "version_strings": ["Wireshark 1.10.12."],
     }
 ]
 package_test_data = [
@@ -37,4 +37,11 @@
         "version": "2.6.2",
         "other_products": [],
     },
+    {
+        "url": "http://ftp.fr.debian.org/debian/pool/main/w/wireshark/",
+        "package_name": "libwireshark16_4.0.3-1_amd64.deb",
+        "product": "wireshark",
+        "version": "4.0.3",
+        "other_products": ["lua", "nghttp2"],
+    },
 ]