From 3e80f1d15be4a550a2f9782460a867cfca8e5b7e Mon Sep 17 00:00:00 2001 From: Sahil Date: Thu, 4 Feb 2021 02:07:59 +0530 Subject: [PATCH] mysql version pattern bug (#1060) * improve mysql version pattern recognition * remove version bug * Change version pattern * re-run black tests --- cve_bin_tool/checkers/mysql.py | 2 +- test/test_data/mysql.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cve_bin_tool/checkers/mysql.py b/cve_bin_tool/checkers/mysql.py index ce2764ecf5..5871fe725f 100644 --- a/cve_bin_tool/checkers/mysql.py +++ b/cve_bin_tool/checkers/mysql.py @@ -26,5 +26,5 @@ class MysqlChecker(Checker): r"mysql-bench", r"dovecot-mysql", ] - VERSION_PATTERNS = [r"mysql\-([0-9]+\.[0-9]+\-[0-9]+\.[0-9]+\.[0-9]+)"] + VERSION_PATTERNS = [r"mysql\-[0-9]+\.[0-9]+\-([0-9]+\.[0-9]+\.[0-9]+)"] VENDOR_PRODUCT = [("oracle", "mysql"), ("mysql", "mysql")] diff --git a/test/test_data/mysql.py b/test/test_data/mysql.py index ab7388bddb..df91c8bd7b 100644 --- a/test/test_data/mysql.py +++ b/test/test_data/mysql.py @@ -1,7 +1,7 @@ mapping_test_data = [ { "product": "mysql", - "version": "8.0.8.0.20", + "version": "8.0.20", "version_strings": [ r"mysql-8.0-8.0.20", r"To buy MySQL Enterprise support, training, or other products, visit:", @@ -13,6 +13,6 @@ "url": "http://ports.ubuntu.com/pool/main/m/mysql-8.0/", "package_name": "mysql-client-core-8.0_8.0.19-0ubuntu5_arm64.deb", "product": "mysql", - "version": "8.0.8.0.19", + "version": "8.0.19", } ]