Merge pull request #4503 from wazuh/merge-4.5.2-into-4.5.3

Merge 4.5.2 into 4.5.3
wazuh · Sep 7, 2023 · 7ba82ef · 7ba82ef
2 parents 40aef74 + 4507eb9
commit 7ba82ef
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@ Release report: TBD
 
 ### Changed
 
+- Update ITs URL for Debian OVAL ([#4491](https://github.com/wazuh/wazuh-qa/pull/4491)) \- (Tests)
+- Syscollector package inventory deltas fix ([#4483](https://github.com/wazuh/wazuh-qa/pull/4483)) \- (Tests)
+- Update schema sys_programs table ([#4451](https://github.com/wazuh/wazuh-qa/pull/4451)) \- (Tests)
 - Update enrollment logs in system test ([#4442](https://github.com/wazuh/wazuh-qa/pull/4442)) \- (Tests)
 - Fix one_manager_agent environment provisioning by packages for system tests ([#4438](https://github.com/wazuh/wazuh-qa/pull/4438)) \- (Framework)
 - Update framework known flaws files ([#4379](https://github.com/wazuh/wazuh-qa/pull/4379)) \- (Tests)

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
@@ -102,20 +102,22 @@
   configuration_parameters:
   metadata:
     provider_name: Debian Buster
-    expected_format: xml
-    path: /tmp/oval-definitions-buster.xml
-    extension: xml
-    url: https://www.debian.org/security/oval/oval-definitions-buster.xml
+    expected_format: application/x-bzip2
+    path: /tmp/oval-definitions-buster.xml.bz2
+    extension: bz2
+    decompressed_file: /tmp/buster.xml
+    url: https://www.debian.org/security/oval/oval-definitions-buster.xml.bz2
 
 - name: Debian
   description: Debian provider
   configuration_parameters:
   metadata:
     provider_name: Debian Bullseye
-    expected_format: xml
-    path: /tmp/oval-definitions-bullseye.xml
-    extension: xml
-    url: https://www.debian.org/security/oval/oval-definitions-bullseye.xml
+    expected_format: application/x-bzip2
+    path: /tmp/oval-definitions-bullseye.xml.bz2
+    extension: bz2
+    decompressed_file: /tmp/bullseye.xml
+    url: https://www.debian.org/security/oval/oval-definitions-bullseye.xml.bz2
 
 - name: SUSE Linux Enterprise Desktop 11
   description: SUSE Linux Enterprise Desktop 11 provider

diff --git a/tests/integration/test_wazuh_db/data/agent/syscollector_deltas_messages.yaml b/tests/integration/test_wazuh_db/data/agent/syscollector_deltas_messages.yaml
@@ -44,7 +44,7 @@
         "item_id":"e2c92964ad145a635139f6318057506e386e00a3","local_ip":"0.0.0.0","local_port":34340,"pid":0,
         "process":null,"protocol":"tcp","remote_ip":"0.0.0.0","remote_port":0,"rx_queue":1,
         "scan_time":"2021/10/13 14:40:03","state":"listening","tx_queue":1}
-      output: err
+      output: 'ok '
       stage: insert port without PK.
     -
       input: >-
@@ -68,7 +68,7 @@
         "item_id":"e2c92964ad145a635139f6318057506e386e00a3","local_ip":"0.0.0.0","local_port":34340,"pid":0,
         "process":"NULL","protocol":"tcp","remote_ip":"0.0.0.0","remote_port":0,"rx_queue":1,
         "scan_time":"2021/10/13 14:50:03","state":"listening","tx_queue":1}
-      output: err
+      output: 'ok '
       stage: modify port without enough fields (PKs).
     -
       input: >-
@@ -130,7 +130,7 @@
         "priority":20,"processor":3,"resident":129,"rgroup":"root","ruser":"root","scan_time":"2021/10/13 14:57:07",
         "session":116167,"sgroup":"root","share":114,"size":2019,"start_time":5799612,"state":"S","stime":0,
         "suser":"root","tgid":156102,"tty":0,"utime":0,"vm_size":8076,"cmd":"","egroup":"root"}
-      output: err
+      output: 'ok '
       stage: insert process without enough fields.
     -
       input: >-
@@ -175,7 +175,7 @@
         "priority":20,"processor":7,"resident":129,"rgroup":"root","scan_time":"2021/10/13 14:57:07",
         "session":116167,"sgroup":"root","share":114,"size":2019,"start_time":5799612,"state":"S","stime":0,
         "suser":"root","tgid":156102,"tty":0,"utime":0,"vm_size":10000,"cmd":"","egroup":"root","ruser":"root"}
-      output: err
+      output: 'ok '
       stage: modify process without enough fields.
     -
       input: >-
@@ -233,7 +233,7 @@
         "item_id":"caa4868d177fbebc5b145a2a92497ebcf566838a","multiarch":"same",
         "priority":"optional","scan_time":"2021/10/13 15:10:49","size":572,"source":"qtbase-opensource-src",
         "vendor":"Ubuntu Developers <[email protected]>","version":"5.12.8+dfsg-0ubuntu1"}
-      output: err
+      output: 'ok '
       stage: insert package without enough fields.
     -
       input: >-
@@ -269,7 +269,7 @@
         "item_id":"caa4868d177fbebc5b145a2a92497ebcf566838a","multiarch":"same","name":"libqt5opengl5",
         "priority":"optional","scan_time":"2021/10/13 15:10:49","size":572,"source":"qtbase-opensource-src",
         "vendor":"Ubuntu Developers <[email protected]>"}
-      output: err
+      output: 'ok '
       stage: modify package without enough fields.
     -
       input: >-
@@ -332,7 +332,7 @@
         agent 001 dbsync osinfo INSERTED {"checksum":"1634140017886803554","architecture":"x86_64","hostname":"UBUNTU",
         "os_build":"7601","os_major":"6","os_minor":"1","os_release":"sp1","os_version":"6.1.7601",
         "os_display_version":"test"}
-      output: err
+      output: 'ok '
       stage: insert osinfo without enough fields.
     -
       input: >-
@@ -353,7 +353,7 @@
         agent 001 dbsync osinfo MODIFIED {"checksum":"1634140017886803554","architecture":"x86_64","hostname":"UBUNTU",
         "os_build":"7601","os_major":"6","os_minor":"1","os_release":"sp1","os_version":"6.1.7601",
         "os_display_version":"test"}
-      output: err
+      output: 'ok '
       stage: modify osinfo without enough fields.
     -
       input: >-
@@ -401,7 +401,7 @@
         agent 001 dbsync hwinfo INSERTED {"scan_time":"2021/10/13 14:41:43",
         "checksum":"af7b22eef8f5e06c04af4db49c9f8d1d28963918","cpu_MHz":2904,"cpu_cores":2,
         "cpu_name":"Intel(R) Core(TM) i5-9400 CPU @ 2.90GHz","ram_free":2257872,"ram_total":4972208,"ram_usage":54}
-      output: err
+      output: 'ok '
       stage: insert hwinfo without enough fields.
     -
       input: >-
@@ -422,7 +422,7 @@
         agent 001 dbsync hwinfo MODIFIED {"scan_time":"2021/10/13 14:41:43",
         "checksum":"af7b22eef8f5e06c04af4db49c9f8d1d28963918","cpu_MHz":29040,"cpu_cores":2,
         "cpu_name":"Intel(R) Core(TM) i5-9400 CPU @ 2.90GHz","ram_free":225,"ram_total":4972208,"ram_usage":54}
-      output: err
+      output: 'ok '
       stage: modify hwinfo without enough fields.
     -
       input: >-
@@ -468,7 +468,7 @@
       input: >-
         agent 001 dbsync hotfixes INSERTED {"checksum":"ded25e55c93121675adcb8d429dc586cbb351e3a",
         "scan_time":"2021/10/14 02:24:18"}
-      output: err
+      output: 'ok '
       stage: insert hotfix without enough fields.
     -
       input: >-
@@ -492,7 +492,7 @@
       input: >-
         agent 001 dbsync hotfixes MODIFIED {"checksum":"ded25e55c93121675adcb8d429dc586cbb351e3a",
         "scan_time":"2021/10/14 02:24:40"}
-      output: err
+      output: 'ok '
       stage: modify hotfix without enough fields.
     -
       input: >-

diff --git a/version.json b/version.json
@@ -1,4 +1,4 @@
 {
     "version": "4.5.3",
-    "revision": "40505"
+    "revision": "40506"
 }