Merge branch '4.9.0' into merge-4.9.0-into-master

wazuh · May 31, 2024 · e6e6ff9 · e6e6ff9
2 parents e31b0d2 + 8bc24e1
commit e6e6ff9
Show file tree

Hide file tree

Showing 14 changed files with 172 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,10 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0
 
+## [4.7.5]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.5
+
 ## [4.7.4]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -293,10 +293,12 @@ rm -fr %{buildroot}
 %changelog
 * Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu May 30 2024 support <[email protected]> - 4.7.5
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -8,7 +8,7 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-agent (4.8.2-RELEASE) stable; urgency=low
 
@@ -26,7 +26,13 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-agent (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-agent (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -8,7 +8,7 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-manager (4.8.2-RELEASE) stable; urgency=low
 
@@ -26,7 +26,13 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-manager (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-manager (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -642,10 +642,12 @@ rm -fr %{buildroot}
 %changelog
 * Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu May 30 2024 support <[email protected]> - 4.7.5
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -625,7 +625,7 @@ rm -fr %{buildroot}
 %dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/security
 %dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/ssl
 %dir %attr(750, root, wazuh) %{_localstatedir}/api/scripts
-%attr(640, root, wazuh) %{_localstatedir}/api/scripts/wazuh-apid.py
+%attr(640, root, wazuh) %{_localstatedir}/api/scripts/*.py
 %dir %attr(750, root, wazuh) %{_localstatedir}/backup
 %dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/db
 %dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/agents
@@ -889,10 +889,12 @@ rm -fr %{buildroot}
 %changelog
 * Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu May 30 2024 support <[email protected]> - 4.7.5
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json
@@ -2047,7 +2047,79 @@
         "type": "file",
         "user": "root"
     },
-    "/var/ossec/wodles/azure/orm.py": {
+    "/var/ossec/wodles/azure/azure_utils.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "drwxr-x---",
+        "type": "directory",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/__init__.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/analytics.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/graph.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/azure_services/storage.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "drwxr-x---",
+        "type": "directory",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db/__init__.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db/orm.py": {
+        "class": "static",
+        "group": "wazuh",
+        "mode": "0750",
+        "prot": "-rwxr-x---",
+        "type": "file",
+        "user": "root"
+    },
+    "/var/ossec/wodles/azure/db/utils.py": {
         "class": "static",
         "group": "wazuh",
         "mode": "0750",

diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh
@@ -110,6 +110,11 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
 # Customize OpenSearch Dashboards with Wazuh
 # -----------------------------------------------------------------------------
 
+# Set v7 theme as default
+sed -i "s|value: 'Next (preview)',|value: 'v7',|g" ./src/core/server/ui_settings/settings/theme.js
+sed -i "s|defaultValue: 'v8'|defaultValue: 'v7'|g" ./src/core/server/ui_settings/ui_settings_config.js
+
+
 # Replace App Title
 sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js
 sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -8,7 +8,7 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low
 
@@ -26,7 +26,13 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -108,6 +108,17 @@ find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 755 -exec chmod 750
 find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type d -exec chmod 750 {} \;
 find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 744 -exec chmod 740 {} \;
 
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -exec chown %{USER}:%{GROUP} {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 644 -exec chmod 640 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 755 -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type d -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 744 -exec chmod 740 {} \;
+
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -exec chown %{USER}:%{GROUP} {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 644 -exec chmod 640 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 755 -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type d -exec chmod 750 {} \;
+find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 744 -exec chmod 740 {} \;
 # -----------------------------------------------------------------------------
 
 %pre
@@ -337,10 +348,12 @@ rm -fr %{buildroot}
 %changelog
 * Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu May 30 2024 support <[email protected]> - 4.7.5
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -8,7 +8,7 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 14 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
 
 wazuh-indexer (4.8.2-RELEASE) stable; urgency=low
 
@@ -26,7 +26,13 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 
- -- Wazuh, Inc <[email protected]>  Thu, 09 May 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 05 Jun 2024 00:00:00 +0000
+
+wazuh-indexer (4.7.5-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
+
+ -- Wazuh, Inc <[email protected]>  Thu, 30 May 2024 00:00:00 +0000
 
 wazuh-indexer (4.7.4-RELEASE) stable; urgency=low
 

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -683,10 +683,12 @@ rm -fr %{buildroot}
 %changelog
 * Thu Dec 12 2024 support <[email protected]> - 5.0.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
-* Tue May 14 2024 support <[email protected]> - 4.9.0
+* Wed Jul 10 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Thu May 09 2024 support <[email protected]> - 4.8.0
+* Wed Jun 05 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu May 30 2024 support <[email protected]> - 4.7.5
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
 * Thu Apr 25 2024 support <[email protected]> - 4.7.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <[email protected]> - 4.7.3

diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py
@@ -171,7 +171,7 @@ def test_check_wazuh_manager_modulesd():
 
 @pytest.mark.wazuh
 def test_check_wazuh_manager_apid():
-    assert check_call("ps -xa | grep wazuh-apid | grep -v grep", shell=True) != ""
+    assert check_call("ps -xa | grep wazuh_apid | grep -v grep", shell=True) != ""
 
 @pytest.mark.wazuh_cluster
 def test_check_wazuh_manager_clusterd():
@@ -208,10 +208,17 @@ def test_check_wazuh_api_status():
 @pytest.mark.wazuh
 def test_check_log_errors():
     found_error = False
+    exceptions = [
+        'WARNING: Cluster error detected',
+        'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.',
+        "ERROR: Could not send message through the cluster after '10' attempts"
+
+    ]
+
     with open('/var/ossec/logs/ossec.log', 'r') as f:
         for line in f.readlines():
             if 'ERROR' in line:
-                if 'ERROR: Cluster error detected' not in line and 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' not in line:
+                if not any(exception in line for exception in exceptions):
                     found_error = True
                     break
     assert found_error == False, line

diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh
@@ -200,7 +200,8 @@ function check_curlVersion() {
 function check_dist() {
     common_logger -d "Checking system distribution."
     dist_detect
-    if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] && [ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ]; then
+    if  [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] &&
+        [ "${DIST_NAME}" != "amzn" ]   && [ "${DIST_NAME}" != "ubuntu" ] && [ "${DIST_NAME}" != "rocky" ]; then
         notsupported=1
     fi
     if [ "${DIST_NAME}" == "centos" ] && { [ "${DIST_VER}" -ne "7" ] && [ "${DIST_VER}" -ne "8" ]; }; then
@@ -211,9 +212,9 @@ function check_dist() {
     fi
 
     if [ "${DIST_NAME}" == "amzn" ]; then
-        if [ "${DIST_VER}" != "2" ] &&
-           [ "${DIST_VER}" != "2023" ] &&
-           [ "${DIST_VER}" != "2018.03" ]; then
+        if  [ "${DIST_VER}" != "2" ] &&
+            [ "${DIST_VER}" != "2023" ] &&
+            [ "${DIST_VER}" != "2018.03" ]; then
             notsupported=1
         fi
         if [ "${DIST_VER}" -eq "2023" ]; then
@@ -223,21 +224,29 @@ function check_dist() {
 
     if [ "${DIST_NAME}" == "ubuntu" ]; then
         if  [ "${DIST_VER}" == "16" ] || [ "${DIST_VER}" == "18" ] ||
-            [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ]; then
+            [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] ||
+            [ "${DIST_VER}" == "24" ]; then
             if [ "${DIST_SUBVER}" != "04" ]; then
                 notsupported=1
             fi
         else
             notsupported=1
         fi
     fi
+
+    if [ "${DIST_NAME}" == "rocky" ]; then
+        if [ "${DIST_VER}" != "9" ] || [ "${DIST_SUBVER}" != "4" ]; then
+            notsupported=1
+        fi
+    fi
+
     if [ -n "${notsupported}" ] && [ -z "${ignore}" ]; then
         common_logger -e "The recommended systems are: Red Hat Enterprise Linux 7, 8, 9; CentOS 7, 8; Amazon Linux 2; Ubuntu 16.04, 18.04, 20.04, 22.04. The current system does not match this list. Use -i|--ignore-check to skip this check."
         exit 1
     fi
     common_logger -d "Detected distribution name: ${DIST_NAME}"
     common_logger -d "Detected distribution version: ${DIST_VER}"
-    
+
 }
 
 function checks_health() {
@@ -375,11 +384,11 @@ function checks_ports() {
     elif [ "${sys_type}" == "apt-get" ]; then
         installCommon_aptInstallList "${dep}"
     fi
-    
+
     if [ "${#not_installed[@]}" -gt 0 ]; then
             wia_dependencies_installed+=("${dep}")
     fi
-    
+
     common_logger -d "Checking ports availability."
     used_port=0
     ports=("$@")