From 1e4c5563d3dfa37369c65a363e780ac2eda92d7a Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 30 Nov 2023 14:44:27 +0100 Subject: [PATCH 1/2] #12416 fixed encryption_passphrase in metaconsole --- pandora_console/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/index.php b/pandora_console/index.php index 4ca8f80a82..27f84d53fb 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1234,7 +1234,7 @@ if (has_metaconsole() === true [ 'dbhost' => $config['replication_dbhost'], 'dbuser' => $config['replication_dbuser'], - 'dbpass' => io_output_password($config['replication_dbpass']), + 'dbpass' => $config['replication_dbpass'], 'dbname' => $config['replication_dbname'], ] ); From 616a8d728b760ea0499fe1a0674d4b278b85dcc9 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 11 Dec 2023 17:56:48 +0100 Subject: [PATCH 2/2] #12416 fixed multiples encrypts --- pandora_console/include/functions_io.php | 3 +++ pandora_console/index.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php index 6283fdbaed..6264a75138 100755 --- a/pandora_console/include/functions_io.php +++ b/pandora_console/include/functions_io.php @@ -581,6 +581,9 @@ function io_output_password($password, $wrappedBy='') $output = ($plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext; + // If password already decrypt return same password. + $output = (empty($plaintext) === true) ? $password : $plaintext; + return sprintf( '%s%s%s', $wrappedBy, diff --git a/pandora_console/index.php b/pandora_console/index.php index 27f84d53fb..4ca8f80a82 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1234,7 +1234,7 @@ if (has_metaconsole() === true [ 'dbhost' => $config['replication_dbhost'], 'dbuser' => $config['replication_dbuser'], - 'dbpass' => $config['replication_dbpass'], + 'dbpass' => io_output_password($config['replication_dbpass']), 'dbname' => $config['replication_dbname'], ] );