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

Better bugfix for additional account switching

Browse source
This commit is contained in:
djmaze 2021-12-02 00:42:15 +01:00
parent a736f3697d
commit 64e77de103
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
View file

@ -17,13 +17,6 @@ class AdditionalAccount extends Account
return \md5(parent::Hash() . $this->ParentEmail()); return \md5(parent::Hash() . $this->ParentEmail());
} }
public function jsonSerialize()
{
$aData = parent::jsonSerialize();
$aData[] = ''; // was ParentEmail
return $aData;
}
public function asTokenArray(MainAccount $oMainAccount) : array public function asTokenArray(MainAccount $oMainAccount) : array
{ {
$sHash = $oMainAccount->CryptKey(); $sHash = $oMainAccount->CryptKey();
@ -40,9 +33,9 @@ class AdditionalAccount extends Account
bool $bThrowExceptionOnFalse = false) : ?Account /* PHP7.4: ?self*/ bool $bThrowExceptionOnFalse = false) : ?Account /* PHP7.4: ?self*/
{ {
$iCount = \count($aAccountHash); $iCount = \count($aAccountHash);
if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 8 <= $iCount && 9 >= $iCount) { if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 <= $iCount && 9 >= $iCount) {
$sHash = $oActions->getMainAccountFromToken()->CryptKey(); $sHash = $oActions->getMainAccountFromToken()->CryptKey();
$sPasswordHMAC = (8 < $iCount) ? \array_pop($aAccountHash) : null; $sPasswordHMAC = (7 < $iCount) ? \array_pop($aAccountHash) : null;
if ($sPasswordHMAC && $sPasswordHMAC === \hash_hmac('sha1', $aAccountHash[3], $sHash)) { if ($sPasswordHMAC && $sPasswordHMAC === \hash_hmac('sha1', $aAccountHash[3], $sHash)) {
$aAccountHash[3] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash[3], $sHash); $aAccountHash[3] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash[3], $sHash);
$aAccountHash[6] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash[6], $sHash); $aAccountHash[6] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash[6], $sHash);