Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-05 07:27:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent decrypt error for #859

Browse source
This commit is contained in:
the-djmaze 2023-02-03 12:30:46 +01:00
parent b182372b83
commit c4df524a06
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
View file

@ -91,9 +91,11 @@ abstract class AbstractConfig implements \JsonSerializable
public function getDecrypted(string $sSection, string $sName, $mDefault = null) public function getDecrypted(string $sSection, string $sName, $mDefault = null)
{ {
// $salt = \basename($this->sFile) not possible due to RainLoop\Plugins\Property // $salt = \basename($this->sFile) not possible due to RainLoop\Plugins\Property
return isset($this->aData[$sSection][$sName][0]) if (!empty($this->aData[$sSection][$sName][0])) try {
? \SnappyMail\Crypt::DecryptFromJSON($this->aData[$sSection][$sName][0], \APP_SALT) return \SnappyMail\Crypt::DecryptFromJSON($this->aData[$sSection][$sName][0], \APP_SALT);
: $mDefault; } catch (\Throwable $e) {
}
return $mDefault;
} }
public function setEncrypted(string $sSectionKey, string $sParamKey, $mParamValue) : void public function setEncrypted(string $sSectionKey, string $sParamKey, $mParamValue) : void

7
snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
View file

@ -187,9 +187,14 @@ class Property implements \JsonSerializable
#[\ReturnTypeWillChange] #[\ReturnTypeWillChange]
public function jsonSerialize() public function jsonSerialize()
{ {
$mValue = $this->mValue;
if ($this->encrypted && $mValue) try {
$mValue = \SnappyMail\Crypt::DecryptFromJSON($mValue, \APP_SALT);
} catch (\Throwable $e) {
}
return array( return array(
'@Object' => 'Object/PluginProperty', '@Object' => 'Object/PluginProperty',
'value' => $this->encrypted ? \SnappyMail\Crypt::DecryptFromJSON($this->mValue, \APP_SALT) : $this->mValue, 'value' => $mValue,
'placeholder' => $this->sPlaceholder, 'placeholder' => $this->sPlaceholder,
'name' => $this->sName, 'name' => $this->sName,
'type' => $this->iType, 'type' => $this->iType,