From feb5d6aa99a7c42afe34eb7646ae1d8ea03a8e37 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Oct 2023 14:55:23 +0200 Subject: [PATCH] Fix Better protection if decryption fails --- htdocs/core/lib/security.lib.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index f0ad9555a58..2c6bd359534 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -187,15 +187,23 @@ function dolDecrypt($chain, $key = '') } if (empty($key)) { - $key = $conf->file->instance_unique_id; + if (!empty($conf->file->dolcrypt_key)) { + // If dolcrypt_key is defined, we used it in priority + $key = $conf->file->dolcrypt_key; + } else { + // We fall back on the instance_unique_id + $key = $conf->file->instance_unique_id; + } } + //var_dump('key='.$key); $reg = array(); if (preg_match('/^dolcrypt:([^:]+):(.+)$/', $chain, $reg)) { $ciphering = $reg[1]; if (function_exists('openssl_decrypt')) { if (empty($key)) { - return 'Error dolDecrypt decrypt key is empty'; + dol_syslog("Error dolDecrypt decrypt key is empty", LOG_WARNING); + return $chain; } $tmpexplode = explode(':', $reg[2]); if (!empty($tmpexplode[1]) && is_string($tmpexplode[0])) { @@ -204,7 +212,8 @@ function dolDecrypt($chain, $key = '') $newchain = openssl_decrypt($tmpexplode[0], $ciphering, $key, 0, null); } } else { - $newchain = 'Error dolDecrypt function openssl_decrypt() not available'; + dol_syslog("Error dolDecrypt openssl_decrypt is not available", LOG_ERR); + return $chain; } return $newchain; } else {