Merge branch '4.8.0' into fix/6445-e2e-pipeline

wazuh · May 9, 2024 · d31398d · d31398d
2 parents f32f78a + 6c71e94
commit d31398d
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Disable debug evidences for Vulnerability Detector E2E tests by default ([#5331](https://github.com/wazuh/wazuh-qa/pull/5331)) \- ( Tests)
+- Include CVE-2023-4822 vulnerability to grafana packages ([#5332](https://github.com/wazuh/wazuh-qa/pull/5332)) \- (Framework)
 - Remove sslverify from host manager install package method ([#5339](https://github.com/wazuh/wazuh-qa/pull/5339)) \- (Framework)
 - Include additional Vulnerability Detector E2E tests ([#5287](https://github.com/wazuh/wazuh-qa/pull/5287)) \- (Framework + Tests)
 - Change Vulnerability Detection feed updated waiter ([#5227](https://github.com/wazuh/wazuh-qa/pull/5227)) \- (Tests)
@@ -59,6 +60,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fix upgrade macOS package cases for vulnerability scanner E2E ([#5334](https://github.com/wazuh/wazuh-qa/pull/5334)) \- (Tests)
+- Fix test cases in Vulnerability Detection E2E test by adding new packages ([#5349](https://github.com/wazuh/wazuh-qa/pull/5349)) \- (Tests)
 - Fix macOS alert collection for E2E Vulnerability Detection tests ([#5337](https://github.com/wazuh/wazuh-qa/pull/5337)) \- (Framework)
 - Fix packages in Windows and macOS upgrade cases ([#5223](https://github.com/wazuh/wazuh-qa/pull/5223)) \- (Framework + Tests)
 - Fix vulnerabilities and add new packages to Vulnerability Detector E2E tests ([#5234](https://github.com/wazuh/wazuh-qa/pull/5234)) \- (Tests)

diff --git a/...wazuh_testing/wazuh_testing/end_to_end/vulnerability_detector_packages/vuln_packages.json b/...wazuh_testing/wazuh_testing/end_to_end/vulnerability_detector_packages/vuln_packages.json
@@ -2,9 +2,7 @@
   "nmap-6.46": {
     "package_name": "nmap",
     "package_version": "6.46-1",
-    "CVE": [
-      "CVE-2018-15173"
-    ],
+    "CVE": ["CVE-2018-15173"],
     "urls": {
       "centos": {
         "amd64": "https://nmap.org/dist/nmap-6.46-1.x86_64.rpm"
@@ -33,7 +31,8 @@
       "CVE-2022-31097",
       "CVE-2022-23552",
       "CVE-2022-23498",
-      "CVE-2023-3128"
+      "CVE-2023-3128",
+      "CVE-2023-4822"
     ],
     "urls": {
       "ubuntu": {
@@ -64,7 +63,8 @@
       "CVE-2022-31097",
       "CVE-2022-23552",
       "CVE-2022-23498",
-      "CVE-2023-3128"
+      "CVE-2023-3128",
+      "CVE-2023-4822"
     ],
     "urls": {
       "centos": {
@@ -94,7 +94,8 @@
       "CVE-2022-31107",
       "CVE-2022-31097",
       "CVE-2022-23552",
-      "CVE-2022-23498"
+      "CVE-2022-23498",
+      "CVE-2023-4822"
     ],
     "urls": {
       "ubuntu": {
@@ -124,7 +125,8 @@
       "CVE-2022-31107",
       "CVE-2022-31097",
       "CVE-2022-23552",
-      "CVE-2022-23498"
+      "CVE-2022-23498",
+      "CVE-2023-4822"
     ],
     "urls": {
       "centos": {
@@ -150,7 +152,8 @@
       "CVE-2022-31130",
       "CVE-2022-31123",
       "CVE-2022-23552",
-      "CVE-2022-23498"
+      "CVE-2022-23498",
+      "CVE-2023-4822"
     ],
     "urls": {
       "ubuntu": {
@@ -176,7 +179,8 @@
       "CVE-2022-31130",
       "CVE-2022-31123",
       "CVE-2022-23552",
-      "CVE-2022-23498"
+      "CVE-2022-23498",
+      "CVE-2023-4822"
     ],
     "urls": {
       "centos": {
@@ -202,7 +206,8 @@
       "CVE-2022-39307",
       "CVE-2022-39306",
       "CVE-2022-23552",
-      "CVE-2022-23498"
+      "CVE-2022-23498",
+      "CVE-2023-4822"
     ],
     "urls": {
       "ubuntu": {
@@ -228,7 +233,8 @@
       "CVE-2022-39307",
       "CVE-2022-39306",
       "CVE-2022-23552",
-      "CVE-2022-23498"
+      "CVE-2022-23498",
+      "CVE-2023-4822"
     ],
     "urls": {
       "centos": {
@@ -289,10 +295,7 @@
   "grafana-10.0.0": {
     "package_name": "grafana",
     "package_version": "10.0.0",
-    "CVE": [
-      "CVE-2023-4822",
-      "CVE-2023-4399"
-    ],
+    "CVE": ["CVE-2023-4822", "CVE-2023-4399", "CVE-2023-4822"],
     "urls": {
       "ubuntu": {
         "amd64": "https://dl.grafana.com/oss/release/grafana_10.0.0_amd64.deb",
@@ -304,10 +307,7 @@
   "grafana-10.0.0-1": {
     "package_name": "grafana",
     "package_version": "10.0.0-1",
-    "CVE": [
-      "CVE-2023-4822",
-      "CVE-2023-4399"
-    ],
+    "CVE": ["CVE-2023-4822", "CVE-2023-4399", "CVE-2023-4822"],
     "urls": {
       "centos": {
         "amd64": "https://dl.grafana.com/oss/release/grafana-10.0.0-1.x86_64.rpm",
@@ -454,7 +454,6 @@
     },
     "uninstall_name": "node*",
     "product_id": "{391CF67B-4D6E-46F2-BE9B-BEB71FA31FBF}"
-
   },
   "node-v18.0.0": {
     "package_name": "Node.js",
@@ -537,20 +536,19 @@
     "CVE": [],
     "urls": {
       "windows": {
-          "amd64": "https://nodejs.org/dist/v18.20.0/node-v18.20.0-x64.msi"
+        "amd64": "https://nodejs.org/dist/v18.20.0/node-v18.20.0-x64.msi"
       }
     },
     "uninstall_name": "node*",
     "product_id": "{ED801E31-1556-48A1-AC38-BADEF42169B0}"
-
   },
   "node-v18.20.2": {
     "package_name": "node",
     "package_version": "18.20.2",
     "CVE": [],
     "urls": {
       "windows": {
-          "amd64": "https://nodejs.org/dist/v18.20.2/node-v18.20.2-x64.msi"
+        "amd64": "https://nodejs.org/dist/v18.20.2/node-v18.20.2-x64.msi"
       }
     },
     "uninstall_name": "node*",
@@ -559,14 +557,10 @@
   "node-v19.5.0": {
     "package_name": "Node.js",
     "package_version": "19.5.0",
-    "CVE": [
-      "CVE-2023-23936",
-      "CVE-2023-23920",
-      "CVE-2023-23918"
-    ],
+    "CVE": ["CVE-2023-23936", "CVE-2023-23920", "CVE-2023-23918"],
     "urls": {
       "windows": {
-          "amd64": "https://nodejs.org/dist/v19.5.0/node-v19.5.0-x64.msi"
+        "amd64": "https://nodejs.org/dist/v19.5.0/node-v19.5.0-x64.msi"
       }
     },
     "uninstall_name": "node*",
@@ -575,14 +569,10 @@
   "node-v19.6.0": {
     "package_name": "Node.js",
     "package_version": "19.6.0",
-    "CVE": [
-      "CVE-2023-23936",
-      "CVE-2023-23920",
-      "CVE-2023-23918"
-    ],
+    "CVE": ["CVE-2023-23936", "CVE-2023-23920", "CVE-2023-23918"],
     "urls": {
       "windows": {
-          "amd64": "https://nodejs.org/dist/v19.6.0/node-v19.6.0-x64.msi"
+        "amd64": "https://nodejs.org/dist/v19.6.0/node-v19.6.0-x64.msi"
       }
     },
     "uninstall_name": "node*",
@@ -608,9 +598,7 @@
   "lynx-2.8.8": {
     "package_name": "lynx",
     "package_version": "2.8.8-0.3.dev15.el7",
-    "CVE": [
-      "CVE-2021-38165"
-    ],
+    "CVE": ["CVE-2021-38165"],
     "urls": {
       "centos": {
         "amd64": "https://download.cf.centos.org/centos/7/os/x86_64/Packages/lynx-2.8.8-0.3.dev15.el7.x86_64.rpm"
@@ -621,11 +609,7 @@
   "firefox-78.9.0": {
     "package_name": "firefox",
     "package_version": "78.9.0-1.el7.centos",
-    "CVE": [
-      "CVE-2023-6873",
-      "CVE-2023-6872",
-      "CVE-2022-38478"
-    ],
+    "CVE": ["CVE-2023-6873", "CVE-2023-6872", "CVE-2022-38478"],
     "urls": {
       "centos": {
         "amd64": "https://download.cf.centos.org/centos/7/updates/x86_64/Packages/firefox-78.9.0-1.el7.centos.x86_64.rpm"
@@ -636,10 +620,7 @@
   "firefox-91.13.0": {
     "package_name": "firefox",
     "package_version": "91.13.0-1.el7.centos",
-    "CVE": [
-      "CVE-2023-6873",
-      "CVE-2023-6872"
-    ],
+    "CVE": ["CVE-2023-6873", "CVE-2023-6872"],
     "urls": {
       "centos": {
         "amd64": "https://download.cf.centos.org/centos/7/updates/x86_64/Packages/firefox-91.13.0-1.el7.centos.x86_64.rpm"
@@ -832,9 +813,7 @@
   "http-proxy-0.5.9": {
     "package_name": "http-proxy",
     "package_version": "0.5.9",
-    "CVE": [
-      "CVE-2017-16014"
-    ],
+    "CVE": ["CVE-2017-16014"],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -847,9 +826,7 @@
   "http-proxy-0.5.10": {
     "package_name": "http-proxy",
     "package_version": "0.5.10",
-    "CVE": [
-      "CVE-2017-16014"
-    ],
+    "CVE": ["CVE-2017-16014"],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -862,10 +839,7 @@
   "systeminformation-4.34.23": {
     "package_name": "systeminformation",
     "package_version": "4.34.23",
-    "CVE": [
-      "CVE-2021-21388",
-      "CVE-2021-21315"
-    ],
+    "CVE": ["CVE-2021-21388", "CVE-2021-21315"],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -878,11 +852,7 @@
   "systeminformation-5.0.0": {
     "package_name": "systeminformation",
     "package_version": "5.0.0",
-    "CVE": [
-      "CVE-2021-21388",
-      "CVE-2021-21315",
-      "CVE-2023-42810"
-    ],
+    "CVE": ["CVE-2021-21388", "CVE-2021-21315", "CVE-2023-42810"],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -892,11 +862,45 @@
     "uninstall_name": "systeminformation",
     "use_npm": true
   },
+  "axios-0.6.0": {
+    "package_name": "axios",
+    "package_version": "0.6.0",
+    "CVE": [
+      "CVE-2019-10742",
+      "CVE-2021-3749",
+      "CVE-2020-28168"
+    ],
+    "urls": {
+      "macos": {
+        "amd64": "[email protected]",
+        "arm64v8": "[email protected]"
+      }
+    },
+    "uninstall_name": "axios",
+    "use_npm": true
+  },
+  "axios-0.10.0": {
+    "package_name": "axios",
+    "package_version": "0.10.0",
+    "CVE": [
+      "CVE-2020-28168",
+      "CVE-2021-3749",
+      "CVE-2023-45857",
+      "CVE-2019-10742"
+    ],
+    "urls": {
+      "macos": {
+        "amd64": "[email protected]",
+        "arm64v8": "[email protected]"
+      }
+    },
+    "uninstall_name": "axios",
+    "use_npm": true
+  },
   "http-proxy-0.7.0": {
     "package_name": "http-proxy",
     "package_version": "0.7.0",
-    "CVE": [
-    ],
+    "CVE": [],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -909,8 +913,7 @@
   "http-proxy-0.7.2": {
     "package_name": "http-proxy",
     "package_version": "0.7.2",
-    "CVE": [
-    ],
+    "CVE": [],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -923,8 +926,7 @@
   "luxon-2.5.2": {
     "package_name": "luxon",
     "package_version": "2.5.2",
-    "CVE": [
-    ],
+    "CVE": [],
     "urls": {
       "macos": {
         "amd64": "[email protected]",
@@ -937,9 +939,7 @@
   "luxon-3.0.0": {
     "package_name": "luxon",
     "package_version": "3.0.0",
-    "CVE": [
-      "CVE-2022-31129"
-    ],
+    "CVE": ["CVE-2022-31129"],
     "urls": {
       "macos": {
         "amd64": "[email protected]",