feat(#3040): Integration tests for Vulnerability Detector - RHEL 9 su…

…pport
wazuh · Sep 27, 2023 · ff14180 · ff14180
1 parent 00598b1
commit ff14180
Show file tree

Hide file tree

Showing 18 changed files with 410 additions and 353 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
 Wazuh commit: https://github.com/wazuh/wazuh/commit/9087982b0c4ae0180bcdcd214a2b243e75cd8416 \
 Release report: https://github.com/wazuh/wazuh/issues/19111
 
+### Added
+
+- Add tests for Vulnerability Detector: Red Hat 9 support (https://github.com/wazuh/wazuh-qa/pull/4497) \- (Tests)
+
 ### Changed
 
 - Update the cluster master logs reliability test to run with python 3.7 [#4445](https://github.com/wazuh/wazuh-qa/pull/4478) \- (Tests)

diff --git a/deps/wazuh_testing/wazuh_testing/mocking/__init__.py b/deps/wazuh_testing/wazuh_testing/mocking/__init__.py
@@ -68,6 +68,8 @@
               'os_arch': 'x86_64', 'config_sum': '', 'merged_sum': '', 'manager_host': 'alas2', 'node_name': 'node01',
               'date_add': '1645538646', 'last_keepalive': '253402300799', 'sync_status': 'synced',
               'connection_status': 'active'},
+    'RHEL9': {'os_name': 'CentOS Linux', 'os_major': '9', 'os_minor': '1', 'os_platform': 'centos',
+              'name': 'centos9', 'connection_status': 'active'},
     'RHEL8': {'os_name': 'CentOS Linux', 'os_major': '8', 'os_minor': '1', 'os_platform': 'centos',
               'name': 'centos8', 'connection_status': 'active'},
     'RHEL7': {'os_name': 'CentOS Linux', 'os_major': '7', 'os_minor': '1', 'os_platform': 'centos', 'os_version': '7.0',

diff --git a/...tector/test_feeds/data/configuration_template/configuration_import_invalid_feed_type.yaml b/...tector/test_feeds/data/configuration_template/configuration_import_invalid_feed_type.yaml
@@ -8,19 +8,19 @@
             value: 'yes'
         - provider:
             attributes:
-              - name: 'redhat'
+              - name: redhat
             elements:
               - enabled:
                   value: 'yes'
               - os:
                   attributes:
                     - url: CUSTOM_FEED_URL
-                  value: '8'
+                  value: '9'
               - url:
                   value: CUSTOM_FEED_URL
         - provider:
             attributes:
-              - name: 'nvd'
+              - name: nvd
             elements:
               - enabled:
                   value: 'no'
@@ -42,7 +42,7 @@
 
     - section: wodle
       attributes:
-        - name: 'syscollector'
+        - name: syscollector
       elements:
         - disabled:
             value: 'yes'
@@ -57,19 +57,19 @@
             value: 'yes'
         - provider:
             attributes:
-              - name: 'debian'
+              - name: debian
             elements:
               - enabled:
                   value: 'yes'
               - os:
                   attributes:
                     - url: CUSTOM_FEED_URL
-                  value: 'bullseye'
+                  value: bullseye
               - url:
                   value: CUSTOM_FEED_URL
         - provider:
             attributes:
-              - name: 'nvd'
+              - name: nvd
             elements:
               - enabled:
                   value: 'no'
@@ -91,7 +91,7 @@
 
     - section: wodle
       attributes:
-        - name: 'syscollector'
+        - name: syscollector
       elements:
         - disabled:
             value: 'yes'
@@ -106,17 +106,17 @@
             value: 'yes'
         - provider:
             attributes:
-              - name: 'canonical'
+              - name: canonical
             elements:
               - enabled:
                   value: 'yes'
               - os:
                   attributes:
                     - url: CUSTOM_FEED_URL
-                  value: 'jammy'
+                  value: jammy
         - provider:
             attributes:
-              - name: 'nvd'
+              - name: nvd
             elements:
               - enabled:
                   value: 'no'
@@ -138,7 +138,7 @@
 
     - section: wodle
       attributes:
-        - name: 'syscollector'
+        - name: syscollector
       elements:
         - disabled:
             value: 'yes'
@@ -153,17 +153,17 @@
             value: 'yes'
         - provider:
             attributes:
-              - name: 'alas'
+              - name: alas
             elements:
               - enabled:
                   value: 'yes'
               - os:
                   attributes:
                     - url: CUSTOM_FEED_URL
-                  value: 'amazon-linux-2'
+                  value: amazon-linux-2
         - provider:
             attributes:
-              - name: 'nvd'
+              - name: nvd
             elements:
               - enabled:
                   value: 'no'
@@ -185,7 +185,7 @@
 
     - section: wodle
       attributes:
-        - name: 'syscollector'
+        - name: syscollector
       elements:
         - disabled:
             value: 'yes'
@@ -200,15 +200,15 @@
             value: 'yes'
         - provider:
             attributes:
-              - name: 'arch'
+              - name: arch
             elements:
               - enabled:
                   value: 'yes'
               - url:
                   value: CUSTOM_FEED_URL
         - provider:
             attributes:
-              - name: 'nvd'
+              - name: nvd
             elements:
               - enabled:
                   value: 'no'
@@ -230,91 +230,91 @@
 
     - section: wodle
       attributes:
-        - name: 'syscollector'
+        - name: syscollector
       elements:
         - disabled:
             value: 'yes'
 
 # MSU configuration
 - sections:
-  - section: vulnerability-detector
-    elements:
-      - enabled:
-          value: 'yes'
-      - run_on_start:
-          value: 'yes'
-      - provider:
-          attributes:
-            - name: 'msu'
-          elements:
-            - enabled:
-                value: 'yes'
-            - url:
-                value: CUSTOM_FEED_URL
-      - provider:
-          attributes:
-            - name: 'nvd'
-          elements:
-            - enabled:
-                value: 'no'
+    - section: vulnerability-detector
+      elements:
+        - enabled:
+            value: 'yes'
+        - run_on_start:
+            value: 'yes'
+        - provider:
+            attributes:
+                - name: msu
+            elements:
+                - enabled:
+                    value: 'yes'
+                - url:
+                    value: CUSTOM_FEED_URL
+        - provider:
+            attributes:
+                - name: nvd
+            elements:
+                - enabled:
+                    value: 'no'
 
-  - section: sca
+- section: sca
     elements:
       - enabled:
           value: 'no'
 
-  - section: rootcheck
+- section: rootcheck
     elements:
       - disabled:
           value: 'yes'
 
-  - section: syscheck
+- section: syscheck
     elements:
       - disabled:
           value: 'yes'
 
-  - section: wodle
+- section: wodle
     attributes:
-      - name: 'syscollector'
-    elements:
+      - name: syscollector
+        elements:
       - disabled:
           value: 'yes'
 
 # NVD configuration
 - sections:
-  - section: vulnerability-detector
-    elements:
-      - enabled:
-          value: 'yes'
-      - run_on_start:
-          value: 'yes'
-      - provider:
-          attributes:
-            - name: 'nvd'
-          elements:
+    - section: vulnerability-detector
+        elements:
+        - enabled:
+            value: 'yes'
+        - run_on_start:
+            value: 'yes'
+        - provider:
+            attributes:
+            - name: nvd
+            elements:
             - enabled:
                 value: 'yes'
             - url:
                 value: CUSTOM_FEED_URL
 
-  - section: sca
+- section: sca
     elements:
       - enabled:
           value: 'no'
 
-  - section: rootcheck
+- section: rootcheck
     elements:
       - disabled:
           value: 'yes'
 
-  - section: syscheck
+- section: syscheck
     elements:
       - disabled:
           value: 'yes'
 
-  - section: wodle
+- section: wodle
     attributes:
-      - name: 'syscollector'
+      - name: syscollector
     elements:
       - disabled:
           value: 'yes'
@@ -329,17 +329,17 @@
             value: 'yes'
         - provider:
             attributes:
-              - name: 'suse'
+              - name: suse
             elements:
               - enabled:
                   value: 'yes'
               - os:
                   attributes:
                     - url: CUSTOM_FEED_URL
-                  value: '15-desktop'
+                  value: 15-desktop
         - provider:
             attributes:
-              - name: 'nvd'
+              - name: nvd
             elements:
               - enabled:
                   value: 'no'
@@ -361,7 +361,7 @@
 
     - section: wodle
       attributes:
-        - name: 'syscollector'
+        - name: syscollector
       elements:
         - disabled:
             value: 'yes'
diff --git a/...egration/test_vulnerability_detector/test_feeds/data/test_cases/cases_download_feeds.yaml b/...egration/test_vulnerability_detector/test_feeds/data/test_cases/cases_download_feeds.yaml
@@ -46,6 +46,18 @@
     download_timeout: 150
     update_treshold_weeks: 2
 
+- name: RHEL9
+  description: Red Hat Enterprise Linux provider
+  configuration_parameters:
+    PROVIDER: redhat
+    OS: '9'
+  metadata:
+    provider_name: Red Hat Enterprise Linux 9
+    provider_json_name: JSON Red Hat Enterprise Linux
+    provider_os: RHEL9
+    download_timeout: 150
+    update_treshold_weeks: 2
+
 - name: TRUSTY
   description: Canonical provider
   configuration_parameters: