fix: Be more flexible in GCC detection logic

Author: qmfrederik

cve_bin_tool/checkers/gcc.py

@@ -32,7 +32,7 @@ class GccChecker(Checker):
     ]
     FILENAME_PATTTERN = [r"gcc"]
     VERSION_PATTERNS = [
-        r"GCC: \(GNU\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",
+        r"GCC: \([a-zA-Z ,0-9]+\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",
         # r"gcc ([0-9]+\.[0-9]+(\.[0-9]+)?)",  # does not return correct version number on some packages
     ]
     VENDOR_PRODUCT = [("gnu", "gcc")]

test/condensed-downloads/mingw-w64-ucrt-x86_64-zlib-1.3.1-1-any.pkg.tar.zst.tar.gz

@@ -31,6 +31,7 @@
         "package_name": "bzip2-1.0.8.tgz",
         "product": "bzip2",
         "version": "1.0.8",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://archive.ubuntu.com/ubuntu/pool/main/b/bzip2/",

test/test_data/bzip2.py

@@ -18,7 +18,7 @@
         "package_name": "curl-7.77.0.tgz",
         "product": "curl",
         "version": "7.77.0",
-        "other_products": ["libcurl"],
+        "other_products": ["libcurl", "gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/c/curl/",

test/test_data/curl.py

@@ -31,6 +31,7 @@
         "package_name": "dovecot-2.3.15.tgz",
         "product": "dovecot",
         "version": "2.3.15",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://archive.ubuntu.com/ubuntu/pool/main/d/dovecot/",

test/test_data/dovecot.py

@@ -26,6 +26,7 @@
         "package_name": "freeradius-3.0.21nb3.tgz",
         "product": "freeradius",
         "version": "3.0.21",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/f/freeradius/",

test/test_data/freeradius.py

@@ -12,6 +12,11 @@
         "version": "9.1",
         "version_strings": ["GCC: (GNU) 9.1"],
     },
+    {
+        "product": "gcc",
+        "version": "8.2.0",
+        "version_strings": ["GCC: (Rev3, Built by MSYS2 project) 8.2.0"],
+    },
 ]
 package_test_data = [
     {
@@ -26,4 +31,11 @@
         "product": "gcc",
         "version": "8.4.1",
     },
+    {
+        "url": "https://mirror.msys2.org/mingw/ucrt64/",
+        "package_name": "mingw-w64-ucrt-x86_64-zlib-1.3.1-1-any.pkg.tar.zst",
+        "product": "gcc",
+        "version": "13.2.0",
+        "other_products": ["zlib"],
+    },
 ]

test/test_data/gcc.py

@@ -38,5 +38,6 @@
         "package_name": "gnupg-1.4.23nb11.tgz",
         "product": "gnupg",
         "version": "1.4.23",
+        "other_products": ["gcc"],
     },
 ]

test/test_data/gnupg.py

@@ -24,6 +24,7 @@
         "package_name": "hdf5-1.10.6.tgz",
         "product": "hdf5",
         "version": "1.10.6",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://download-ib01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/h/",

test/test_data/hdf5.py

@@ -42,6 +42,7 @@
         "package_name": "icu-68.2.tgz",
         "product": "international_components_for_unicode",
         "version": "68.2",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://rpmfind.net/linux/dag/redhat/el4/en/x86_64/dag/RPMS/",

test/test_data/icu.py

@@ -22,6 +22,7 @@
         "package_name": "irssi-1.2.3nb1.tgz",
         "product": "irssi",
         "version": "1.2.3",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/i/irssi/",

test/test_data/irssi.py

@@ -14,7 +14,7 @@
         "package_name": "kubernetes-client-1.18.0-lp152.1.4.x86_64.rpm",
         "product": "kubernetes",
         "version": "1.18.0",
-        "other_products": ["go"],
+        "other_products": ["go", "gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/k/kubernetes/",

test/test_data/kubernetes.py

@@ -32,6 +32,7 @@
         "package_name": "libarchive-3.4.3.tgz",
         "product": "libarchive",
         "version": "3.4.3",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",

test/test_data/libarchive.py

@@ -20,6 +20,7 @@
         "package_name": "libical-3.0.9.tgz",
         "product": "libical",
         "version": "3.0.9",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://download-ib01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/l/",

test/test_data/libical.py

@@ -26,6 +26,7 @@
         "package_name": "libsndfile-1.0.31.tgz",
         "product": "libsndfile",
         "version": "1.0.31",
+        "other_products": ["gcc"],
     },
     {
         "url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",

test/test_data/libsndfile.py

@@ -31,5 +31,6 @@
         "package_name": "libsoup-2.70.0nb4.tgz",
         "product": "libsoup",
         "version": "2.70.0",
+        "other_products": ["gcc"],
     },
 ]

test/test_data/libsoup.py

@@ -37,5 +37,6 @@
         "package_name": "libssh2-1.9.0nb1.tgz",
         "product": "libssh2",
         "version": "1.9.0",
+        "other_products": ["gcc"],
     },
 ]

test/test_data/libssh2.py

@@ -38,6 +38,7 @@
         "package_name": "libVNCServer-0.9.13.tgz",
         "product": "libvncserver",
         "version": "0.9.13",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://archive.ubuntu.com/ubuntu/pool/main/libv/libvncserver/",

test/test_data/libvncserver.py

@@ -14,6 +14,7 @@
         "package_name": "open-iscsi-2.1.8-97.2.i586.rpm",
         "product": "open-iscsi",
         "version": "2.1.8",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/o/open-iscsi/",

test/test_data/open_iscsi.py

@@ -22,5 +22,6 @@
         "package_name": "zsh_5.8-6+b1_amd64.deb",
         "product": "zsh",
         "version": "5.8",
+        "other_products": ["gcc"],
     },
 ]