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

Protect against multiple accounts on different tabs #892

Browse source
This commit is contained in:
the-djmaze 2023-01-30 22:42:37 +01:00
parent c21817e5e0
commit 3396a3d791
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ class AdditionalAccount extends Account
public function Hash() : string
{
return \md5(parent::Hash() . $this->ParentEmail());
return \sha1(parent::Hash() . $this->ParentEmail());
}
public static function convertArray(array $aAccount) : array

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

@ -74,12 +74,16 @@ class Utils
public static function GetConnectionToken() : string
{
$oActions = \RainLoop\Api::Actions();
$oAccount = $oActions->getAccountFromToken(false) ?: $oActions->getMainAccountFromToken(false);
if ($oAccount) {
return $oAccount->Hash();
}
$sToken = static::GetCookie(self::CONNECTION_TOKEN);
if (!$sToken) {
$sToken = \MailSo\Base\Utils::Sha1Rand(APP_SALT);
static::SetCookie(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
}
return \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
}