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

Changes for Decrypt issue #442

Browse source
This commit is contained in:
the-djmaze 2022-06-21 22:27:26 +02:00
parent 28d4a018fd
commit 6800c76e40
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -605,7 +605,7 @@ trait Messages
{ {
if ($aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment)) if ($aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment))
{ {
$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : ''; $sFolder = isset($aValues['Folder']) ? (string) $aValues['Folder'] : '';
$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0; $iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
$sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : ''; $sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';

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

@ -14,15 +14,14 @@ trait Raw
$sRawKey = (string) $this->GetActionParam('RawKey', ''); $sRawKey = (string) $this->GetActionParam('RawKey', '');
$aValues = $this->getDecodedRawKeyValue($sRawKey); $aValues = $this->getDecodedRawKeyValue($sRawKey);
$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : ''; $sFolder = isset($aValues['Folder']) ? (string) $aValues['Folder'] : '';
$iUid = (isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0); $iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
$sMimeIndex = (string) (isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : ''); $sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';
\header('Content-Type: text/plain'); \header('Content-Type: text/plain');
return $this->MailClient()->MessageMimeStream(function ($rResource) { return $this->MailClient()->MessageMimeStream(function ($rResource) {
if (\is_resource($rResource)) if (\is_resource($rResource)) {
{
\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource); \MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
} }
}, $sFolder, $iUid, $sMimeIndex); }, $sFolder, $iUid, $sMimeIndex);
@ -132,7 +131,7 @@ trait Raw
$bIsRangeRequest = true; $bIsRangeRequest = true;
} }
$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : ''; $sFolder = isset($aValues['Folder']) ? (string) $aValues['Folder'] : '';
$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0; $iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
$sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : ''; $sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';

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

@ -480,12 +480,12 @@ trait User
{ {
$aValues = $this->getDecodedRawKeyValue($sHash); $aValues = $this->getDecodedRawKeyValue($sHash);
$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : ''; $sFolder = isset($aValues['Folder']) ? (string) $aValues['Folder'] : '';
$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0; $iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
$sMimeIndex = (string) isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : ''; $sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';
$sContentTypeIn = (string) isset($aValues['MimeType']) ? $aValues['MimeType'] : ''; $sContentTypeIn = isset($aValues['MimeType']) ? (string) $aValues['MimeType'] : '';
$sFileNameIn = (string) isset($aValues['FileName']) ? $aValues['FileName'] : ''; $sFileNameIn = isset($aValues['FileName']) ? (string) $aValues['FileName'] : '';
$oFileProvider = $this->FilesProvider(); $oFileProvider = $this->FilesProvider();

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

@ -35,12 +35,12 @@ class Utils
); );
} }
public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = '') : ?array public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = '') : array
{ {
return \SnappyMail\Crypt::DecryptUrlSafe( return \SnappyMail\Crypt::DecryptUrlSafe(
$sEncodedValues, $sEncodedValues,
\sha1(APP_SALT.$sCustomKey.'Q'.static::GetSessionToken(false)) \sha1(APP_SALT.$sCustomKey.'Q'.static::GetSessionToken(false))
) ?: null; ) ?: array();
} }
public static function GetSessionToken(bool $generate = true) : ?string public static function GetSessionToken(bool $generate = true) : ?string

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

@ -60,6 +60,7 @@ abstract class Crypt
} catch (\Throwable $e) { } catch (\Throwable $e) {
\trigger_error(__CLASS__ . "::{$fn}(): " . $e->getMessage()); \trigger_error(__CLASS__ . "::{$fn}(): " . $e->getMessage());
} }
// \trigger_error(__CLASS__ . '::Decrypt() invalid $data or $key');
} else { } else {
// \trigger_error(__CLASS__ . '::Decrypt() invalid $data'); // \trigger_error(__CLASS__ . '::Decrypt() invalid $data');
} }