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

Cleanup handling of Utils::GetCookie()

Browse source
This commit is contained in:
the-djmaze 2022-11-09 08:38:46 +01:00
parent 9db813b6ee
commit 697250e361
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,11 +26,13 @@ class Actions
/** /**
* This session cookie contains a \RainLoop\Model\Account * This session cookie contains a \RainLoop\Model\Account
* Value is Base64 EncryptToJSON
*/ */
const AUTH_SPEC_TOKEN_KEY = 'smaccount'; const AUTH_SPEC_TOKEN_KEY = 'smaccount';
/** /**
* This session cookie optionally contains a \RainLoop\Model\AdditionalAccount * This session cookie optionally contains a \RainLoop\Model\AdditionalAccount
* Value is Base64 EncryptToJSON
*/ */
const AUTH_ADDITIONAL_TOKEN_KEY = 'smadditional'; const AUTH_ADDITIONAL_TOKEN_KEY = 'smadditional';
@ -744,7 +746,7 @@ class Actions
} }
} }
$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null); $sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY);
if (null !== $sToken) { if (null !== $sToken) {
Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY); Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY);

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

@ -32,7 +32,7 @@ trait Admin
protected function getAdminAuthKey() : string protected function getAdminAuthKey() : string
{ {
$cookie = Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY, ''); $cookie = Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY);
if ($cookie) { if ($cookie) {
$aAdminHash = Utils::DecodeKeyValuesQ($cookie); $aAdminHash = Utils::DecodeKeyValuesQ($cookie);
if (!empty($aAdminHash[1]) && 'token' === $aAdminHash[0]) { if (!empty($aAdminHash[1]) && 'token' === $aAdminHash[0]) {

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

@ -416,7 +416,7 @@ trait UserAuth
public function GetSpecLogoutCustomMgsWithDeletion(): string public function GetSpecLogoutCustomMgsWithDeletion(): string
{ {
$sResult = Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, ''); $sResult = Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY) ?: '';
if (\strlen($sResult)) { if (\strlen($sResult)) {
Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY); Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY);
} }

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

@ -58,7 +58,7 @@ class Utils
public static function GetSessionToken(bool $generate = true) : ?string public static function GetSessionToken(bool $generate = true) : ?string
{ {
$sToken = static::GetCookie(self::SESSION_TOKEN, null); $sToken = static::GetCookie(self::SESSION_TOKEN);
if (!$sToken) { if (!$sToken) {
if (!$generate) { if (!$generate) {
return null; return null;
@ -108,9 +108,8 @@ class Utils
/** /**
* @param mixed $mDefault = null * @param mixed $mDefault = null
* @return mixed
*/ */
public static function GetCookie(string $sName, $mDefault = null) public static function GetCookie(string $sName) : ?string
{ {
if (isset($_COOKIE[$sName])) { if (isset($_COOKIE[$sName])) {
$aParts = []; $aParts = [];
@ -122,7 +121,7 @@ class Utils
\ksort($aParts); \ksort($aParts);
return \implode('', $aParts); return \implode('', $aParts);
} }
return $mDefault; return null;
} }
public static function GetSecureCookie(string $sName) public static function GetSecureCookie(string $sName)