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

Bugfix for crypt system

Browse source
This commit is contained in:
djmaze 2021-11-10 15:10:28 +01:00
parent b102fc0e4c
commit c13724fbbb
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
View file

@ -259,6 +259,7 @@ trait Contacts
return $aData; return $aData;
} }
// Try the old
$aData = \RainLoop\Utils::DecodeKeyValues($sData); $aData = \RainLoop\Utils::DecodeKeyValues($sData);
if ($aData) { if ($aData) {
return array( return array(

10
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
View file

@ -178,10 +178,7 @@ trait UserAuth
} }
} }
$aData = \SnappyMail\Crypt::DecryptFromJSON( $aData = \SnappyMail\Crypt::DecryptFromJSON(\MailSo\Base\Utils::UrlSafeBase64Decode($this->sSpecAuthToken));
\MailSo\Base\Utils::UrlSafeBase64Decode($this->sSpecAuthToken),
APP_SALT . Utils::GetShortToken()
);
if (!empty($aData)) { if (!empty($aData)) {
$this->oSpecAuthAccount = Account::NewInstanceFromTokenArray( $this->oSpecAuthAccount = Account::NewInstanceFromTokenArray(
$this, $this,
@ -200,10 +197,7 @@ trait UserAuth
public function SetAuthToken(Account $oAccount): void public function SetAuthToken(Account $oAccount): void
{ {
$sSpecAuthToken = \MailSo\Base\Utils::UrlSafeBase64Encode(\SnappyMail\Crypt::EncryptToJSON( $sSpecAuthToken = \MailSo\Base\Utils::UrlSafeBase64Encode(\SnappyMail\Crypt::EncryptToJSON($oAccount));
$oAccount,
APP_SALT . Utils::GetShortToken()
));
$this->sSpecAuthToken = $sSpecAuthToken; $this->sSpecAuthToken = $sSpecAuthToken;
$this->oSpecAuthAccount = null; $this->oSpecAuthAccount = null;

2
snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
View file

@ -23,7 +23,7 @@ class Utils
/** /**
* Session cookie * Session cookie
* Used by: EncodeKeyValuesQ, DecodeKeyValuesQ * Used by: EncodeKeyValuesQ, DecodeKeyValuesQ and getAccountFromToken/SetAuthToken
*/ */
SHORT_TOKEN = 'smsession'; SHORT_TOKEN = 'smsession';

2
snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
View file

@ -88,7 +88,7 @@ abstract class Crypt
public static function DecryptFromJSON(string $data, string $key = null) /* : mixed */ public static function DecryptFromJSON(string $data, string $key = null) /* : mixed */
{ {
$aData = \json_decode($data, true); $aData = \json_decode($data, true);
$aData = \is_array($aData) ? static::Decrypt(\array_map('base64_decode', $aData), $key) : null; return \is_array($aData) ? static::Decrypt(\array_map('base64_decode', $aData), $key) : null;
} }
public static function Encrypt($data, string $key = null) : array public static function Encrypt($data, string $key = null) : array