Merge pull request #4578 from wazuh/merge-4.6.0-into-4.7.0

Merge 4.6.0 into 4.7.0
wazuh · Oct 6, 2023 · e81906f · e81906f
2 parents b3084fb + 60b0500
commit e81906f
Show file tree

Hide file tree

Showing 23 changed files with 80 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,7 @@ Release report: TBD
 - Add IT tests FIM registry monitoring using wildcards. ([#4270](https://github.com/wazuh/wazuh-qa/pull/4270)) \- (Framework + Tests)
 - Update schema database version ([#4128](https://github.com/wazuh/wazuh-qa/pull/4128)) \- (Tests)
 - Update framework known flaws files ([#4380](https://github.com/wazuh/wazuh-qa/pull/4380)) \- (Tests)
+- Add tests for Vulnerability Detector: Red Hat 9 support (https://github.com/wazuh/wazuh-qa/pull/4497) \- (Tests)
 
 ### Changed
 
@@ -79,6 +80,7 @@ Release report: TBD
 
 ### Fixed
 
+- Fix Integration Test FIM tests skip marks changed ([#4569] (https://github.com/wazuh/wazuh-qa/pull/4569)) \- (Tests)
 - Fix invalid AR conf in integration tests ([#4521](https://github.com/wazuh/wazuh-qa/pull/4521)) \- (Tests)
 - Fix an error in AR library and test ([#4511](https://github.com/wazuh/wazuh-qa/pull/4511)) \- (Framework + Tests)
 - Fix provisioned pytest failure fixed ([#4520](https://github.com/wazuh/wazuh-qa/pull/4520)) \- (Framework)
@@ -93,10 +95,10 @@ Release report: TBD
 - Fix bug in the framework on migration tool ([#4027](https://github.com/wazuh/wazuh-qa/pull/4027)) \- (Framework)
 - Fix test cluster / integrity sync system test and configuration to avoid flaky behavior ([#4406](https://github.com/wazuh/wazuh-qa/pull/4406)) \- (Tests)
 
-## [4.5.3] - 28/09/2023
+## [4.5.3] - 10/10/2023
 
-Wazuh commit: https://github.com/wazuh/wazuh/commit/9087982b0c4ae0180bcdcd214a2b243e75cd8416 \
-Release report: https://github.com/wazuh/wazuh/issues/19111
+Wazuh commit: https://github.com/wazuh/wazuh/commit/388ce54b704d7b6aa2dda1b30258ad1642b26a2d \
+Release report: https://github.com/wazuh/wazuh/issues/19446
 
 ### Changed
 
@@ -105,6 +107,7 @@ Release report: https://github.com/wazuh/wazuh/issues/19111
 
 ### Fixed
 
+- Fix enrollment system tests ([#4562](https://github.com/wazuh/wazuh-qa/pull/4562/)) \- (Tests)
 - Update the request method used to call the login API endpoint. ([#4492](https://github.com/wazuh/wazuh-qa/pull/4492)) \- (Tests)
 - Enhancing the handling of authd and remoted simulators in case of restart failures ([#Wazuh-jenkins#3487](https://github.com/wazuh/wazuh-qa/pull/4205)) \- (Tests)
 - Fix py dependency version to install for Windows after the change to Python 3.11([#4523](https://github.com/wazuh/wazuh-qa/pull/4523)) \- (Framework)

diff --git a/deps/wazuh_testing/wazuh_testing/mocking/__init__.py b/deps/wazuh_testing/wazuh_testing/mocking/__init__.py
@@ -84,6 +84,8 @@
                   'config_sum': '', 'merged_sum': '', 'manager_host': 'alas2023',  '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/...tion/test_fim/test_registry/test_registry_basic_usage/test_basic_usage_delete_registry.py b/...tion/test_fim/test_registry/test_registry_basic_usage/test_basic_usage_delete_registry.py
@@ -102,7 +102,7 @@ def get_configuration(request):
 
 
 # test
-@pytest.mark.skip(sys.platform=='win32', reason="Blocked by #4077.")
+@pytest.mark.skipif(sys.platform == 'win32', reason="Blocked by #4077.")
 @pytest.mark.parametrize('key, subkey, arch, value_list', [
     (key, sub_key_1, KEY_WOW64_64KEY, ['value1', 'value2', 'value3']),
     (key, sub_key_2, KEY_WOW64_32KEY, ['value1', 'value2', 'value3']),

diff --git a/tests/integration/test_fim/test_synchronization/test_registry_responses_win32.py b/tests/integration/test_fim/test_synchronization/test_registry_responses_win32.py
@@ -93,7 +93,7 @@ def get_configuration(request):
 
 
 # tests
-@pytest.mark.skip(sys.platform=='win32', reason="Blocked by #4077.")
+@pytest.mark.skipif(sys.platform == 'win32', reason="Blocked by #4077.")
 @pytest.mark.parametrize('key_name', [':subkey1', 'subkey2:', ':subkey3:'])
 @pytest.mark.parametrize('value_name', [':value1', 'value2:', ':value3:'])
 def test_registry_sync_after_restart(key_name, value_name, configure_local_internal_options_module,

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
@@ -15,7 +15,7 @@
               - os:
                   attributes:
                     - url: CUSTOM_FEED_URL
-                  value: '8'
+                  value: '9'
               - url:
                   value: CUSTOM_FEED_URL
         - provider:

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:

diff --git a/...gration/test_vulnerability_detector/test_feeds/data/test_cases/cases_duplicate_feeds.yaml b/...gration/test_vulnerability_detector/test_feeds/data/test_cases/cases_duplicate_feeds.yaml
@@ -1,3 +1,14 @@
+- name: RedHat
+  description: Insert RHEL 9 OVAL and JSON feed from local path
+  configuration_parameters:
+    PROVIDER: redhat
+    OS: '9'
+    OS_PATH: CUSTOM_REDHAT_OVAL_FEED_PATH
+    PATH: CUSTOM_REDHAT_JSON_FEED_PATH
+  metadata:
+    provider_name: Red Hat Enterprise Linux 9
+    provider_json_name: JSON Red Hat Enterprise Linux
+
 - name: RedHat
   description: Insert RHEL 8 OVAL and JSON feed from local path
   configuration_parameters:

diff --git a/...est_vulnerability_detector/test_feeds/data/test_cases/cases_import_invalid_feed_type.yaml b/...est_vulnerability_detector/test_feeds/data/test_cases/cases_import_invalid_feed_type.yaml
@@ -5,7 +5,7 @@
     target: redhat
     custom_feed_url: https://s3.amazonaws.com/ci.wazuh.com/qa/testing_files/dummy_files/dummy.pdf
     provider_feed_names:
-      - redhat 8
+      - redhat 9
       - jredhat provider
 
 - name: Debian - JPG

diff --git a/...st_vulnerability_detector/test_feeds/data/test_cases/cases_validate_xml_feed_content.yaml b/...st_vulnerability_detector/test_feeds/data/test_cases/cases_validate_xml_feed_content.yaml
@@ -42,6 +42,17 @@
     decompressed_file: /tmp/rhel8.xml
     url: https://www.redhat.com/security/data/oval/v2/RHEL8/rhel-8-including-unpatched.oval.xml.bz2
 
+- name: Red Hat Enterprise Linux
+  description: Red Hat Enterprise Linux provider
+  configuration_parameters:
+  metadata:
+    provider_name: Red Hat Enterprise Linux 9
+    expected_format: application/x-bzip2
+    path: /tmp/rhel-9-including-unpatched.oval.xml.bz2
+    extension: bz2
+    decompressed_file: /tmp/rhel9.xml
+    url: https://www.redhat.com/security/data/oval/v2/RHEL9/rhel-9-including-unpatched.oval.xml.bz2
+
 - name: Canonical Jammy
   description: Canonical provider
   configuration_parameters:

diff --git a/...ntegration/test_vulnerability_detector/test_providers/data/test_cases/cases_disabled.yaml b/...ntegration/test_vulnerability_detector/test_providers/data/test_cases/cases_disabled.yaml
@@ -79,6 +79,15 @@
   metadata:
     provider_name: Ubuntu Jammy
 
+- name: RHEL 9
+  description: Test disabled Red Hat Enterprise Linux 9
+  configuration_parameters:
+    ENABLED: 'no'
+    PROVIDER: redhat
+    OS: '9'
+  metadata:
+    provider_name: Red Hat Enterprise Linux 9
+
 - name: RHEL 8
   description: Test disabled Red Hat Enterprise Linux 8
   configuration_parameters:

diff --git a/...integration/test_vulnerability_detector/test_providers/data/test_cases/cases_enabled.yaml b/...integration/test_vulnerability_detector/test_providers/data/test_cases/cases_enabled.yaml
@@ -79,6 +79,15 @@
   metadata:
     provider_name: Ubuntu Jammy
 
+- name: RHEL 9
+  description: Test enabled Red Hat Enterprise Linux 8
+  configuration_parameters:
+    ENABLED: 'yes'
+    PROVIDER: redhat
+    OS: '9'
+  metadata:
+    provider_name: Red Hat Enterprise Linux 9
+
 - name: RHEL 8
   description: Test enabled Red Hat Enterprise Linux 8
   configuration_parameters:

diff --git a/..._vulnerability_detector/test_providers/data/test_cases/cases_multiple_provider_feeds.yaml b/..._vulnerability_detector/test_providers/data/test_cases/cases_multiple_provider_feeds.yaml
@@ -1,12 +1,12 @@
-- name: RedHat 8
-  description: Insert RHEL 8 OVAL and JSON feed from local path
+- name: RedHat 9
+  description: Insert RHEL 9 OVAL and JSON feed from local path
   configuration_parameters:
     PROVIDER: redhat
-    OS: '8'
+    OS: '9'
     OS_PATH: CUSTOM_REDHAT_OVAL_FEED_PATH
     PATH: CUSTOM_REDHAT_JSON_FEED_PATH
   metadata:
-    provider_name: Red Hat Enterprise Linux 8
+    provider_name: Red Hat Enterprise Linux 9
     provider_json_name: JSON Red Hat Enterprise Linux
     oval_feed_path: CUSTOM_REDHAT_OVAL_FEED_PATH
     json_feed_path: CUSTOM_REDHAT_JSON_FEED_PATH

diff --git a/...ults/data/configuration_template/configuration_scan_provider_and_nvd_vulnerabilities.yaml b/...ults/data/configuration_template/configuration_scan_provider_and_nvd_vulnerabilities.yaml
@@ -15,7 +15,7 @@
               - os:
                   attributes:
                     - path: CUSTOM_REDHAT_OVAL_FEED
-                  value: '8'
+                  value: '9'
               - path:
                   value: CUSTOM_REDHAT_JSON_FEED
         - provider:

diff --git a/...scan_results/data/configuration_template/configuration_scan_provider_vulnerabilities.yaml b/...scan_results/data/configuration_template/configuration_scan_provider_vulnerabilities.yaml
@@ -15,7 +15,7 @@
               - os:
                   attributes:
                     - path: CUSTOM_REDHAT_OVAL_FEED
-                  value: '8'
+                  value: '9'
               - path:
                   value: CUSTOM_REDHAT_JSON_FEED
         - provider:

diff --git a/...st_scan_results/data/configuration_template/configuration_scan_vulnerability_removal.yaml b/...st_scan_results/data/configuration_template/configuration_scan_vulnerability_removal.yaml
@@ -19,7 +19,7 @@
               - os:
                   attributes:
                     - path: CUSTOM_REDHAT_OVAL_FEED
-                  value: '8'
+                  value: '9'
               - path:
                   value: CUSTOM_REDHAT_JSON_FEED
         - provider:

diff --git a/...on/test_vulnerability_detector/test_scan_results/data/test_cases/cases_no_agent_data.yaml b/...on/test_vulnerability_detector/test_scan_results/data/test_cases/cases_no_agent_data.yaml
@@ -3,7 +3,7 @@
   configuration_parameters:
     NVD_JSON_PATH: CUSTOM_NVD_JSON_PATH
   metadata:
-    system: RHEL8
+    system: RHEL9
 
 - name: UBUNTU
   description: Scan UBUNTU vulnerabilities using only the NVD feed

diff --git a/...tector/test_scan_results/data/test_cases/cases_scan_provider_and_nvd_vulnerabilities.yaml b/...tector/test_scan_results/data/test_cases/cases_scan_provider_and_nvd_vulnerabilities.yaml
@@ -3,7 +3,7 @@
   configuration_parameters: null
   metadata:
     provider_name: redhat
-    system: RHEL8
+    system: RHEL9
     json_feed: custom_redhat_json_feed.json
     oval_feed: custom_redhat_oval_feed.xml
     nvd_feed: custom_nvd_feed.json

diff --git a/...ility_detector/test_scan_results/data/test_cases/cases_scan_provider_vulnerabilities.yaml b/...ility_detector/test_scan_results/data/test_cases/cases_scan_provider_vulnerabilities.yaml
@@ -3,7 +3,7 @@
   configuration_parameters: null
   metadata:
     provider_name: redhat
-    system: RHEL8
+    system: RHEL9
     json_feed: custom_redhat_json_feed.json
     oval_feed: custom_redhat_oval_feed.xml
     nvd_feed: custom_nvd_alternative_feed.json

diff --git a/...y_detector/test_scan_results/data/test_cases/cases_scan_vulnerabilities_triaged_null.yaml b/...y_detector/test_scan_results/data/test_cases/cases_scan_vulnerabilities_triaged_null.yaml
@@ -1,8 +1,8 @@
 - name: RHEL
   description: Check that after partial scan is launched triaged status changes from NULL to 1
   configuration_parameters:
-    OS: '8'
+    OS: '9'
     SCAN_INTERVAL: '5'
   metadata:
-    system: RHEL8
+    system: RHEL9
     triaged: ''
diff --git a/...rability_detector/test_scan_results/data/test_cases/cases_scan_vulnerability_removal.yaml b/...rability_detector/test_scan_results/data/test_cases/cases_scan_vulnerability_removal.yaml
@@ -3,7 +3,7 @@
   configuration_parameters: null
   metadata:
     provider_name: redhat
-    system: RHEL8
+    system: RHEL9
     json_feed: custom_redhat_json_feed.json
     oval_feed: custom_redhat_oval_feed.xml
     nvd_feed: custom_nvd_feed.json

diff --git a/tests/system/test_agent_auth/test_agent_auth.py b/tests/system/test_agent_auth/test_agent_auth.py
@@ -64,6 +64,7 @@ def clean_environment():
     host_manager.run_command('wazuh-manager', f"{WAZUH_PATH}/bin/manage_agents -r {agent_id}")
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
     host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
+    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
 
 # IPV6 fixtures
@@ -234,7 +235,6 @@ def test_agent_auth(test_case, get_ip_directions, configure_network, modify_ip_a
     '''
     # Clean ossec.log and cluster.log
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
-    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
     host_manager.control_service(host='wazuh-manager', service='wazuh', state="restarted")
 
     # Start the agent enrollment process using agent-auth

diff --git a/tests/system/test_cluster/test_agent_enrollment/test_agent_enrollment.py b/tests/system/test_cluster/test_agent_enrollment/test_agent_enrollment.py
@@ -32,6 +32,7 @@ def clean_environment():
                                                   check=False)
     host_manager.control_service(host='wazuh-agent1', service='wazuh', state="stopped")
     host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
+    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
 
 def test_agent_enrollment(clean_environment):
@@ -40,7 +41,6 @@ def test_agent_enrollment(clean_environment):
     # Clean ossec.log and cluster.log
     host_manager.clear_file(host='wazuh-master', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
     host_manager.clear_file(host='wazuh-worker1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
-    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
     host_manager.clear_file(host='wazuh-master', file_path=os.path.join(WAZUH_LOGS_PATH, 'cluster.log'))
     host_manager.clear_file(host='wazuh-worker1', file_path=os.path.join(WAZUH_LOGS_PATH, 'cluster.log'))
 

diff --git a/tests/system/test_enrollment/test_enrollment.py b/tests/system/test_enrollment/test_enrollment.py
@@ -72,6 +72,7 @@ def clean_environment():
 
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
     host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
+    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
 
 # IPV6 fixtures
@@ -220,7 +221,6 @@ def test_agent_enrollment(test_case, get_ip_directions, configure_network, modif
     '''
     # Clean ossec.log and cluster.log
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
-    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
     # Start the agent enrollment process by restarting the wazuh-agent
     host_manager.control_service(host='wazuh-manager', service='wazuh', state="restarted")