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

Some md5 to sha1

Browse source
This commit is contained in:
djmaze 2021-12-09 12:40:40 +01:00
parent a512759289
commit b507c4cd75
3 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,7 +187,7 @@ trait Response
$mResult['Hash'] = \md5($mResult['Folder'].$mResult['Uid']); $mResult['Hash'] = \md5($mResult['Folder'].$mResult['Uid']);
$mResult['RequestHash'] = Utils::EncodeKeyValuesQ(array( $mResult['RequestHash'] = Utils::EncodeKeyValuesQ(array(
'V' => APP_VERSION, 'V' => APP_VERSION,
'Account' => $oAccount ? \md5($oAccount->Hash()) : '', 'Account' => $oAccount->Hash(),
'Folder' => $mResult['Folder'], 'Folder' => $mResult['Folder'],
'Uid' => $mResult['Uid'], 'Uid' => $mResult['Uid'],
'MimeType' => 'message/rfc822', 'MimeType' => 'message/rfc822',
@ -337,7 +337,7 @@ trait Response
$mResult['Download'] = Utils::EncodeKeyValuesQ(array( $mResult['Download'] = Utils::EncodeKeyValuesQ(array(
'V' => APP_VERSION, 'V' => APP_VERSION,
'Account' => $oAccount ? \md5($oAccount->Hash()) : '', 'Account' => $oAccount->Hash(),
'Folder' => $mResult['Folder'], 'Folder' => $mResult['Folder'],
'Uid' => $mResult['Uid'], 'Uid' => $mResult['Uid'],
'MimeIndex' => $mResult['MimeIndex'], 'MimeIndex' => $mResult['MimeIndex'],

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

@ -107,7 +107,7 @@ abstract class Account implements \JsonSerializable
public function Hash() : string public function Hash() : string
{ {
return \md5(\implode(APP_SALT, [ return \sha1(\implode(APP_SALT, [
$this->sEmail, $this->sEmail,
$this->Domain()->IncHost(), $this->Domain()->IncHost(),
$this->Domain()->IncPort(), $this->Domain()->IncPort(),

45
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 and getAccountFromToken/SetAuthToken * Used by: EncodeKeyValuesQ, DecodeKeyValuesQ
*/ */
SHORT_TOKEN = 'smsession'; SHORT_TOKEN = 'smsession';
@ -49,20 +49,18 @@ class Utils
public static function EncodeKeyValuesQ(array $aValues, string $sCustomKey = '') : string public static function EncodeKeyValuesQ(array $aValues, string $sCustomKey = '') : string
{ {
return \MailSo\Base\Utils::UrlSafeBase64Encode( return \SnappyMail\Crypt::EncryptUrlSafe(
\MailSo\Base\Crypt::Encrypt( $aValues,
\json_encode($aValues), \sha1(APP_SALT.$sCustomKey.'Q'.static::GetSessionToken())
\md5(APP_SALT.$sCustomKey).'Q'.static::GetShortToken() );
));
} }
public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = '') : array public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = '') : array
{ {
return static::unserialize( return \SnappyMail\Crypt::DecryptUrlSafe(
\MailSo\Base\Crypt::Decrypt( $sEncodedValues,
\MailSo\Base\Utils::UrlSafeBase64Decode($sEncodedValues), \sha1(APP_SALT.$sCustomKey.'Q'.static::GetSessionToken())
\md5(APP_SALT.$sCustomKey).'Q'.static::GetShortToken() );
));
} }
public static function unserialize(string $sDecodedValues) : array public static function unserialize(string $sDecodedValues) : array
@ -74,7 +72,7 @@ class Utils
} }
} }
public static function GetShortToken() : string public static function GetSessionToken() : string
{ {
$sToken = static::GetCookie(self::SHORT_TOKEN, null); $sToken = static::GetCookie(self::SHORT_TOKEN, null);
if (!$sToken) { if (!$sToken) {
@ -82,7 +80,7 @@ class Utils
static::SetCookie(self::SHORT_TOKEN, $sToken, 0); static::SetCookie(self::SHORT_TOKEN, $sToken, 0);
} }
return \md5('Session'.APP_SALT.$sToken.'Token'.APP_SALT); return \sha1('Session'.APP_SALT.$sToken.'Token'.APP_SALT);
} }
public static function GetConnectionToken() : string public static function GetConnectionToken() : string
@ -94,12 +92,12 @@ class Utils
static::SetCookie(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30); static::SetCookie(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
} }
return \md5('Connection'.APP_SALT.$sToken.'Token'.APP_SALT); return \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
} }
public static function GetCsrfToken() : string public static function GetCsrfToken() : string
{ {
return \md5('Csrf'.APP_SALT.self::GetConnectionToken().'Token'.APP_SALT); return \sha1('Csrf'.APP_SALT.self::GetConnectionToken().'Token'.APP_SALT);
} }
public static function UpdateConnectionToken() : void public static function UpdateConnectionToken() : void
@ -111,23 +109,6 @@ class Utils
} }
} }
public static function PathMD5(string $sPath) : string
{
$sResult = '';
if (\is_dir($sPath))
{
$oDirIterator = new \RecursiveDirectoryIterator($sPath);
$oIterator = new \RecursiveIteratorIterator($oDirIterator, \RecursiveIteratorIterator::SELF_FIRST);
foreach ($oIterator as $oFile)
{
$sResult = \md5($sResult.($oFile->isFile() ? \md5_file($oFile) : $oFile));
}
}
return $sResult;
}
public static function ClearHtmlOutput(string $sHtml) : string public static function ClearHtmlOutput(string $sHtml) : string
{ {
// return $sHtml; // return $sHtml;