From a64da709cf3430860f2e55f73ba9fbbe4baf56d1 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 12 Jun 2023 17:02:20 +0200
Subject: [PATCH 1/3] #11539 changed default password in checkDefaultPassword()
function
---
pandora_console/include/class/ConsoleSupervisor.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index 4dc665fb26..28c2e004ac 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -2323,7 +2323,8 @@ class ConsoleSupervisor
'SELECT count(*) FROM tusuario
WHERE
id_user="admin"
- AND password="1da7ee7d45b96d0e1f45ee4ee23da560"
+ AND (password="1da7ee7d45b96d0e1f45ee4ee23da560" OR
+ password="$2y$10$Wv/xoxjI2VAkthJhk/PzeeGIhBKYU/K.TMgUdmW7fEP2NQkdWlB9K")
AND is_admin=1
and disabled!=1'
);
From 69eb293355db3c5c2399fe9844314d54fc3887c3 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 12 Jun 2023 17:05:13 +0200
Subject: [PATCH 2/3] revert commit
---
pandora_console/include/class/ConsoleSupervisor.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index 28c2e004ac..4dc665fb26 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -2323,8 +2323,7 @@ class ConsoleSupervisor
'SELECT count(*) FROM tusuario
WHERE
id_user="admin"
- AND (password="1da7ee7d45b96d0e1f45ee4ee23da560" OR
- password="$2y$10$Wv/xoxjI2VAkthJhk/PzeeGIhBKYU/K.TMgUdmW7fEP2NQkdWlB9K")
+ AND password="1da7ee7d45b96d0e1f45ee4ee23da560"
AND is_admin=1
and disabled!=1'
);
From 7e2e81efb47dc418c34301aef7b8a1f97dc812a9 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Mon, 26 Jun 2023 12:56:20 +0200
Subject: [PATCH 3/3] #11539 added delete files in .txt
---
pandora_console/extras/delete_files/delete_files.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
index 0c0e0bd7fc..5d603ac1f9 100644
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -1692,3 +1692,14 @@ enterprise/godmode/modules/manage_inventory_modules_form.php
enterprise/operation/inventory/inventory.php
include/test.js
include/web2image.js
+enterprise/meta/monitoring/wizard/wizard.agent.php
+enterprise/meta/monitoring/wizard/wizard.create_agent.php
+enterprise/meta/monitoring/wizard/wizard.create_module.php
+enterprise/meta/monitoring/wizard/wizard.main.php
+enterprise/meta/monitoring/wizard/wizard.manage_alert.php
+enterprise/meta/monitoring/wizard/wizard.module.local.php
+enterprise/meta/monitoring/wizard/wizard.module.network.php
+enterprise/meta/monitoring/wizard/wizard.module.web.php
+enterprise/meta/monitoring/wizard/wizard.php
+enterprise/meta/monitoring/wizard/wizard.update_agent.php
+enterprise/meta/monitoring/wizard/wizard.update_module.php
\ No newline at end of file