fix: Be more flexible in GCC detection logic (#4755)

qmfrederik · web-flow · commit 400528f074f8 · 2025-04-04T15:07:40.000+02:00
diff --git a/cve_bin_tool/checkers/gcc.py b/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")]
diff --git a/test/condensed-downloads/mingw-w64-ucrt-x86_64-zlib-1.3.1-1-any.pkg.tar.zst.tar.gz b/test/condensed-downloads/mingw-w64-ucrt-x86_64-zlib-1.3.1-1-any.pkg.tar.zst.tar.gz
diff --git a/test/test_data/bzip2.py b/test/test_data/bzip2.py
@@ -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/",
diff --git a/test/test_data/cairo.py b/test/test_data/cairo.py
@@ -14,6 +14,7 @@
         "package_name": "mingw-w64-ucrt-x86_64-cairo-1.18.2-2-any.pkg.tar.zst",
         "product": "cairo",
         "version": "1.18.2",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://rpmfind.net/linux/fedora/linux/development/rawhide/Everything/aarch64/os/Packages/c/",
diff --git a/test/test_data/curl.py b/test/test_data/curl.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/",
diff --git a/test/test_data/dovecot.py b/test/test_data/dovecot.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/",
diff --git a/test/test_data/freeradius.py b/test/test_data/freeradius.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/",
diff --git a/test/test_data/gcc.py b/test/test_data/gcc.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"],
+    },
 ]
diff --git a/test/test_data/gnupg.py b/test/test_data/gnupg.py
@@ -38,5 +38,6 @@
         "package_name": "gnupg-1.4.23nb11.tgz",
         "product": "gnupg",
         "version": "1.4.23",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/hdf5.py b/test/test_data/hdf5.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/",
diff --git a/test/test_data/icu.py b/test/test_data/icu.py
@@ -52,6 +52,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/",
diff --git a/test/test_data/irssi.py b/test/test_data/irssi.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/",
diff --git a/test/test_data/jbig.py b/test/test_data/jbig.py
@@ -22,5 +22,6 @@
         "package_name": "mingw-w64-ucrt-x86_64-jbigkit-2.1-5-any.pkg.tar.zst",
         "product": "jbig-kit",
         "version": "2.1",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/kubernetes.py b/test/test_data/kubernetes.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/",
diff --git a/test/test_data/libarchive.py b/test/test_data/libarchive.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/",
diff --git a/test/test_data/libical.py b/test/test_data/libical.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/",
diff --git a/test/test_data/libsndfile.py b/test/test_data/libsndfile.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/",
diff --git a/test/test_data/libsoup.py b/test/test_data/libsoup.py
@@ -31,5 +31,6 @@
         "package_name": "libsoup-2.70.0nb4.tgz",
         "product": "libsoup",
         "version": "2.70.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libssh2.py b/test/test_data/libssh2.py
@@ -37,5 +37,6 @@
         "package_name": "libssh2-1.9.0nb1.tgz",
         "product": "libssh2",
         "version": "1.9.0",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/libvncserver.py b/test/test_data/libvncserver.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/",
diff --git a/test/test_data/open_iscsi.py b/test/test_data/open_iscsi.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/",
diff --git a/test/test_data/zlib.py b/test/test_data/zlib.py
@@ -46,5 +46,6 @@
         "package_name": "mingw-w64-x86_64-zlib-1.3-1-any.pkg.tar.zst",
         "product": "zlib",
         "version": "1.3",
+        "other_products": ["gcc"],
     },
 ]
diff --git a/test/test_data/zsh.py b/test/test_data/zsh.py
@@ -16,6 +16,7 @@
         "package_name": "zsh-5.8nb2.tgz",
         "product": "zsh",
         "version": "5.8",
+        "other_products": ["gcc"],
     },
     {
         "url": "http://ftp.debian.org/debian/pool/main/z/zsh/",

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class GccChecker(Checker):`
`32`	`32`	`]`
`33`	`33`	`FILENAME_PATTTERN = [r"gcc"]`
`34`	`34`	`VERSION_PATTERNS = [`
`35`		`- r"GCC: \(GNU\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",`
	`35`	`+ r"GCC: \([a-zA-Z ,0-9]+\) ([0-9]+\.[0-9]+(\.[0-9]+)?)",`
`36`	`36`	`# r"gcc ([0-9]+\.[0-9]+(\.[0-9]+)?)", # does not return correct version number on some packages`
`37`	`37`	`]`
`38`	`38`	`VENDOR_PRODUCT = [("gnu", "gcc")]`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`"package_name": "bzip2-1.0.8.tgz",`
`32`	`32`	`"product": "bzip2",`
`33`	`33`	`"version": "1.0.8",`
	`34`	`+ "other_products": ["gcc"],`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"url": "http://archive.ubuntu.com/ubuntu/pool/main/b/bzip2/",`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"package_name": "mingw-w64-ucrt-x86_64-cairo-1.18.2-2-any.pkg.tar.zst",`
`15`	`15`	`"product": "cairo",`
`16`	`16`	`"version": "1.18.2",`
	`17`	`+ "other_products": ["gcc"],`
`17`	`18`	`},`
`18`	`19`	`{`
`19`	`20`	`"url": "http://rpmfind.net/linux/fedora/linux/development/rawhide/Everything/aarch64/os/Packages/c/",`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"package_name": "curl-7.77.0.tgz",`
`19`	`19`	`"product": "curl",`
`20`	`20`	`"version": "7.77.0",`
`21`		`- "other_products": ["libcurl"],`
	`21`	`+ "other_products": ["libcurl", "gcc"],`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"url": "http://ftp.debian.org/debian/pool/main/c/curl/",`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`"package_name": "freeradius-3.0.21nb3.tgz",`
`27`	`27`	`"product": "freeradius",`
`28`	`28`	`"version": "3.0.21",`
	`29`	`+ "other_products": ["gcc"],`
`29`	`30`	`},`
`30`	`31`	`{`
`31`	`32`	`"url": "http://ftp.debian.org/debian/pool/main/f/freeradius/",`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,6 @@`
`38`	`38`	`"package_name": "gnupg-1.4.23nb11.tgz",`
`39`	`39`	`"product": "gnupg",`
`40`	`40`	`"version": "1.4.23",`
	`41`	`+ "other_products": ["gcc"],`
`41`	`42`	`},`
`42`	`43`	`]`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`"package_name": "hdf5-1.10.6.tgz",`
`25`	`25`	`"product": "hdf5",`
`26`	`26`	`"version": "1.10.6",`
	`27`	`+ "other_products": ["gcc"],`
`27`	`28`	`},`
`28`	`29`	`{`
`29`	`30`	`"url": "https://download-ib01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/h/",`