MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: remove trailing null bytes

pull/9540/head
Luciano Righetti 2024-02-06 14:31:25 +01:00
parent 3174c7138a
commit b13d755547
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Lib/Tools/EncryptedValue.php
View File

@ -29,12 +29,14 @@ class EncryptedValue implements JsonSerializable
* @throws JsonException
* @throws Exception
*/
public function decrypt($key=false)
public function decrypt($key = false)
{
if (!$key) {
$key = Configure::read('Security.encryption_key');
}
if (!$key) return '';
if (!$key) {
return '';
}
$decrypt = BetterSecurity::decrypt(substr($this->value, 2), $key);
return $this->isJson ? JsonTool::decode($decrypt) : $decrypt;
}
@ -55,7 +57,7 @@ class EncryptedValue implements JsonSerializable
* @return string
* @throws Exception
*/
public static function encryptIfEnabled($value, $key=false)
public static function encryptIfEnabled($value, $key = false)
{
if (!$key) {
$key = Configure::read('Security.encryption_key');
@ -72,15 +74,16 @@ class EncryptedValue implements JsonSerializable
* @return string
* @throws Exception
*/
public static function decryptIfEncrypted($value, $key=false)
public static function decryptIfEncrypted($value, $key = false)
{
if(is_resource($value))
if (is_resource($value)) {
$value = stream_get_contents($value);
}
if (EncryptedValue::isEncrypted($value)) {
$self = new EncryptedValue($value);
return $self->decrypt($key);
return $self->decrypt($key);
} else {
return $value;
return trim($value, "\x00");
}
}