From 3112eb2bd59c7c3a5fdf2d55e188706a9b49b67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <david.correa@wazuh.com>
Date: Tue, 2 Jul 2024 09:55:52 +0200
Subject: [PATCH 1/9] Bumped REVISION to 40814

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index f57527d2..f577cf84 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 WAZUH-DOCKER_VERSION="4.8.1"
-REVISION="40813"
+REVISION="40814"

From 7257ddc0aac99cb9f94eb60bd1516fbcee31fcd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <david.correa@wazuh.com>
Date: Tue, 2 Jul 2024 10:09:45 +0200
Subject: [PATCH 2/9] Changed image tag for 4.8.1 RC1

---
 multi-node/docker-compose.yml  | 12 ++++++------
 single-node/docker-compose.yml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index 145af9fb..8c6e166b 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:4.8.1
+    image: wazuh/wazuh-manager:4.8.1-rc1
     hostname: wazuh.master
     restart: always
     ulimits:
@@ -45,7 +45,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:4.8.1
+    image: wazuh/wazuh-manager:4.8.1-rc1
     hostname: wazuh.worker
     restart: always
     ulimits:
@@ -81,7 +81,7 @@ services:
       - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc1
     hostname: wazuh1.indexer
     restart: always
     ports:
@@ -107,7 +107,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc1
     hostname: wazuh2.indexer
     restart: always
     environment:
@@ -129,7 +129,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc1
     hostname: wazuh3.indexer
     restart: always
     environment:
@@ -151,7 +151,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1
+    image: wazuh/wazuh-dashboard:4.8.1-rc1
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 03255d88..eb33365a 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:4.8.1
+    image: wazuh/wazuh-manager:4.8.1-rc1
     hostname: wazuh.manager
     restart: always
     ulimits:
@@ -46,7 +46,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc1
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -71,7 +71,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1
+    image: wazuh/wazuh-dashboard:4.8.1-rc1
     hostname: wazuh.dashboard
     restart: always
     ports:

From 91513bda931dee600653ccb3fd8f66f6318e6db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <david.correa@wazuh.com>
Date: Tue, 2 Jul 2024 10:24:17 +0200
Subject: [PATCH 3/9] Reverted image tag for 4.8.1 RC1

---
 multi-node/docker-compose.yml  | 12 ++++++------
 single-node/docker-compose.yml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index 8c6e166b..145af9fb 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:4.8.1-rc1
+    image: wazuh/wazuh-manager:4.8.1
     hostname: wazuh.master
     restart: always
     ulimits:
@@ -45,7 +45,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:4.8.1-rc1
+    image: wazuh/wazuh-manager:4.8.1
     hostname: wazuh.worker
     restart: always
     ulimits:
@@ -81,7 +81,7 @@ services:
       - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc1
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh1.indexer
     restart: always
     ports:
@@ -107,7 +107,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc1
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh2.indexer
     restart: always
     environment:
@@ -129,7 +129,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc1
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh3.indexer
     restart: always
     environment:
@@ -151,7 +151,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1-rc1
+    image: wazuh/wazuh-dashboard:4.8.1
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index eb33365a..03255d88 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:4.8.1-rc1
+    image: wazuh/wazuh-manager:4.8.1
     hostname: wazuh.manager
     restart: always
     ulimits:
@@ -46,7 +46,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc1
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -71,7 +71,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1-rc1
+    image: wazuh/wazuh-dashboard:4.8.1
     hostname: wazuh.dashboard
     restart: always
     ports:

From 2487a5481e2792c63468c01b0408d0e6f802c45a Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 2 Jul 2024 15:01:37 -0300
Subject: [PATCH 4/9] Add new keystore generation

---
 .../config/etc/cont-init.d/0-wazuh-init       | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
index dae0e1f0..5ec1fe27 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
@@ -122,6 +122,20 @@ create_ossec_key_cert() {
   exec_cmd "openssl req -new -x509 -key ${WAZUH_INSTALL_PATH}/etc/sslmanager.key -out ${WAZUH_INSTALL_PATH}/etc/sslmanager.cert -days 3650 -subj /CN=${HOSTNAME}/"
 }
 
+#########################
+#GenerateKeystoreCert()
+#########################
+GenerateKeystoreCert()
+{
+  # Regenerate keys if they are not valid.
+  keystore_key=/etc/keystore.key
+  keystore_cert=/etc/keystore.cert
+  echo "Generating RSA keys for Keystore."
+  ${WAZUH_INSTALL_PATH}/bin/wazuh-authd -C 365 -B 2048 -K ${WAZUH_INSTALL_PATH}${keystore_key} -X ${WAZUH_INSTALL_PATH}${keystore_cert} -S "/C=US/ST=California/CN=wazuh/"
+  chmod 600 ${WAZUH_INSTALL_PATH}${keystore_key}
+  chmod 600 ${WAZUH_INSTALL_PATH}${keystore_cert}
+}
+
 ##############################################################################
 # Copy all files from $WAZUH_CONFIG_MOUNT to $WAZUH_INSTALL_PATH and respect
 # destination files permissions
@@ -199,7 +213,7 @@ main() {
 
   # Restore files stored in permanent data that are not permanent  (i.e. internal_options.conf)
   apply_exclusion_data
-  
+
   # Apply correct permission and ownership
   set_correct_permOwner
 
@@ -218,6 +232,23 @@ main() {
     fi
   fi
 
+  keystore_key=/etc/keystore.key
+  keystore_cert=/etc/keystore.cert
+
+  # If we come from 4.8.0, no certificates will be found.
+  # Since the Keystore tool previously used sslmanager keys for encryption,
+  # We copy them to the new location to be able to recover the information.
+  if [ ! -f "${WAZUH_INSTALL_PATH}${keystore_key}" ] && [ ! -f "${WAZUH_INSTALL_PATH}${keystore_cert}" ]; then
+    cp -p ${WAZUH_INSTALL_PATH}/etc/sslmanager.cert ${WAZUH_INSTALL_PATH}${keystore_cert}
+    cp -p ${WAZUH_INSTALL_PATH}/etc/sslmanager.key ${WAZUH_INSTALL_PATH}${keystore_key}
+  fi
+
+  # Test if the certificates are valid. If don't, re-generate them
+  ${WAZUH_INSTALL_PATH}/bin/wazuh-keystore -f default -k certificate_test -v test
+  if [ $? -eq 1 ]; then
+    GenerateKeystoreCert
+  fi
+
   # Mount selected files (WAZUH_CONFIG_MOUNT) to container
   mount_files
 

From 665f6fd84a04fcd52ce9228e166d0d57d8da1b71 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 4 Jul 2024 13:01:22 -0300
Subject: [PATCH 5/9] Fix goss test

---
 .github/.goss.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/.goss.yaml b/.github/.goss.yaml
index 50b54fc2..1610cc42 100644
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.8.1-1
+    - 4.8.1
 port:
   tcp:1514:
     listening: true

From 6138516ad9c8ed52edf4288a89f3e500f0e75184 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 4 Jul 2024 13:36:55 -0300
Subject: [PATCH 6/9] Fix wazuh documents tests

---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 0444cba7..cecc3e5c 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -270,7 +270,7 @@ jobs:
          sleep 10
        done
        docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
-       if [[ $docs -gt 1 ]]; then
+       if [[ $docs -gt 0 ]]; then
         echo "wazuh-alerts index documents: ${docs}"
        else
         echo "wazuh-alerts index documents: ${docs}"

From a58306969816a6feb71326c11d78ba5f75240752 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 4 Jul 2024 14:13:07 -0300
Subject: [PATCH 7/9] Bump revision number

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index f577cf84..cff5943a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 WAZUH-DOCKER_VERSION="4.8.1"
-REVISION="40814"
+REVISION="40815"

From 6049aec3818e5a312495f39a19948951cdde44c0 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 4 Jul 2024 14:32:07 -0300
Subject: [PATCH 8/9] change image version por rc2

---
 multi-node/docker-compose.yml  | 12 ++++++------
 single-node/docker-compose.yml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index 145af9fb..dcbf9bbd 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:4.8.1
+    image: wazuh/wazuh-manager:4.8.1-rc2
     hostname: wazuh.master
     restart: always
     ulimits:
@@ -45,7 +45,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:4.8.1
+    image: wazuh/wazuh-manager:4.8.1-rc2
     hostname: wazuh.worker
     restart: always
     ulimits:
@@ -81,7 +81,7 @@ services:
       - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc2
     hostname: wazuh1.indexer
     restart: always
     ports:
@@ -107,7 +107,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc2
     hostname: wazuh2.indexer
     restart: always
     environment:
@@ -129,7 +129,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc2
     hostname: wazuh3.indexer
     restart: always
     environment:
@@ -151,7 +151,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1
+    image: wazuh/wazuh-dashboard:4.8.1-rc2
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 03255d88..b3b40d12 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:4.8.1
+    image: wazuh/wazuh-manager:4.8.1-rc2
     hostname: wazuh.manager
     restart: always
     ulimits:
@@ -46,7 +46,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.8.1
+    image: wazuh/wazuh-indexer:4.8.1-rc2
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -71,7 +71,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1
+    image: wazuh/wazuh-dashboard:4.8.1-rc2
     hostname: wazuh.dashboard
     restart: always
     ports:

From 0682effeca3f96e50348741a6a5cbeef212b4192 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 4 Jul 2024 14:43:23 -0300
Subject: [PATCH 9/9] Rollback image version

---
 multi-node/docker-compose.yml  | 12 ++++++------
 single-node/docker-compose.yml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index dcbf9bbd..145af9fb 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:4.8.1-rc2
+    image: wazuh/wazuh-manager:4.8.1
     hostname: wazuh.master
     restart: always
     ulimits:
@@ -45,7 +45,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:4.8.1-rc2
+    image: wazuh/wazuh-manager:4.8.1
     hostname: wazuh.worker
     restart: always
     ulimits:
@@ -81,7 +81,7 @@ services:
       - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc2
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh1.indexer
     restart: always
     ports:
@@ -107,7 +107,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc2
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh2.indexer
     restart: always
     environment:
@@ -129,7 +129,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc2
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh3.indexer
     restart: always
     environment:
@@ -151,7 +151,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1-rc2
+    image: wazuh/wazuh-dashboard:4.8.1
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index b3b40d12..03255d88 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:4.8.1-rc2
+    image: wazuh/wazuh-manager:4.8.1
     hostname: wazuh.manager
     restart: always
     ulimits:
@@ -46,7 +46,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.8.1-rc2
+    image: wazuh/wazuh-indexer:4.8.1
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -71,7 +71,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.8.1-rc2
+    image: wazuh/wazuh-dashboard:4.8.1
     hostname: wazuh.dashboard
     restart: always
     ports: