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

$bUrlEncode always false, so remove it

Browse source
This commit is contained in:
the-djmaze 2023-02-04 21:27:30 +01:00
parent be0348b324
commit dd829c5d97
2 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -253,14 +253,14 @@ class Actions
} }
} }
protected function compileLogParams(string $sLine, ?Model\Account $oAccount = null, bool $bUrlEncode = false, array $aAdditionalParams = array()): string protected function compileLogParams(string $sLine, ?Model\Account $oAccount = null, array $aAdditionalParams = array()): string
{ {
$aClear = array(); $aClear = array();
if (false !== \strpos($sLine, '{date:')) { if (false !== \strpos($sLine, '{date:')) {
$oConfig = $this->oConfig; $oConfig = $this->oConfig;
$sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) use ($oConfig, $bUrlEncode) { $sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) use ($oConfig) {
return Utils::UrlEncode((new \DateTime('now', new \DateTimeZone($oConfig->Get('logs', 'time_zone', 'UTC'))))->format($aMatch[1]), $bUrlEncode); return (new \DateTime('now', new \DateTimeZone($oConfig->Get('logs', 'time_zone', 'UTC'))))->format($aMatch[1]);
}, $sLine); }, $sLine);
$aClear['/\{date:([^}]*)\}/'] = 'date'; $aClear['/\{date:([^}]*)\}/'] = 'date';
@ -272,13 +272,13 @@ class Actions
} }
if ($oAccount) { if ($oAccount) {
$sLine = \str_replace('{imap:login}', Utils::UrlEncode($oAccount->IncLogin(), $bUrlEncode), $sLine); $sLine = \str_replace('{imap:login}', $oAccount->IncLogin(), $sLine);
$sLine = \str_replace('{imap:host}', Utils::UrlEncode($oAccount->Domain()->IncHost(), $bUrlEncode), $sLine); $sLine = \str_replace('{imap:host}', $oAccount->Domain()->IncHost(), $sLine);
$sLine = \str_replace('{imap:port}', Utils::UrlEncode($oAccount->Domain()->IncPort(), $bUrlEncode), $sLine); $sLine = \str_replace('{imap:port}', $oAccount->Domain()->IncPort(), $sLine);
$sLine = \str_replace('{smtp:login}', Utils::UrlEncode($oAccount->OutLogin(), $bUrlEncode), $sLine); $sLine = \str_replace('{smtp:login}', $oAccount->OutLogin(), $sLine);
$sLine = \str_replace('{smtp:host}', Utils::UrlEncode($oAccount->Domain()->OutHost(), $bUrlEncode), $sLine); $sLine = \str_replace('{smtp:host}', $oAccount->Domain()->OutHost(), $sLine);
$sLine = \str_replace('{smtp:port}', Utils::UrlEncode($oAccount->Domain()->OutPort(), $bUrlEncode), $sLine); $sLine = \str_replace('{smtp:port}', $oAccount->Domain()->OutPort(), $sLine);
} }
$aClear['/\{imap:([^}]*)\}/i'] = 'imap'; $aClear['/\{imap:([^}]*)\}/i'] = 'imap';
@ -287,18 +287,18 @@ class Actions
if (false !== \strpos($sLine, '{request:')) { if (false !== \strpos($sLine, '{request:')) {
if (false !== \strpos($sLine, '{request:ip}')) { if (false !== \strpos($sLine, '{request:ip}')) {
$sLine = \str_replace('{request:ip}', Utils::UrlEncode($this->Http()->GetClientIp( $sLine = \str_replace('{request:ip}',
$this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine); $this->Http()->GetClientIp($this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)),
$sLine);
} }
if (false !== \strpos($sLine, '{request:domain}')) { if (false !== \strpos($sLine, '{request:domain}')) {
$sLine = \str_replace('{request:domain}', $sLine = \str_replace('{request:domain}', $this->Http()->GetHost(true, true), $sLine);
Utils::UrlEncode($this->Http()->GetHost(true, true), $bUrlEncode), $sLine);
} }
if (false !== \strpos($sLine, '{request:domain-clear}')) { if (false !== \strpos($sLine, '{request:domain-clear}')) {
$sLine = \str_replace('{request:domain-clear}', $sLine = \str_replace('{request:domain-clear}',
Utils::UrlEncode(\MailSo\Base\Utils::GetClearDomainName($this->Http()->GetHost(true, true)), $bUrlEncode), \MailSo\Base\Utils::GetClearDomainName($this->Http()->GetHost(true, true)),
$sLine); $sLine);
} }
@ -308,15 +308,15 @@ class Actions
if (false !== \strpos($sLine, '{user:')) { if (false !== \strpos($sLine, '{user:')) {
if (false !== \strpos($sLine, '{user:uid}')) { if (false !== \strpos($sLine, '{user:uid}')) {
$sLine = \str_replace('{user:uid}', $sLine = \str_replace('{user:uid}',
Utils::UrlEncode(\base_convert(\sprintf('%u', \base_convert(\sprintf('%u', \crc32(Utils::GetConnectionToken())), 10, 32),
\crc32(Utils::GetConnectionToken())), 10, 32), $bUrlEncode),
$sLine $sLine
); );
} }
if (false !== \strpos($sLine, '{user:ip}')) { if (false !== \strpos($sLine, '{user:ip}')) {
$sLine = \str_replace('{user:ip}', Utils::UrlEncode($this->Http()->GetClientIp( $sLine = \str_replace('{user:ip}',
$this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine); $this->Http()->GetClientIp($this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)),
$sLine);
} }
if (\preg_match('/\{user:(email|login|domain)\}/i', $sLine)) { if (\preg_match('/\{user:(email|login|domain)\}/i', $sLine)) {
@ -327,14 +327,12 @@ class Actions
if ($oAccount) { if ($oAccount) {
$sEmail = $oAccount->Email(); $sEmail = $oAccount->Email();
$sLine = \str_replace('{user:email}', Utils::UrlEncode($sEmail, $bUrlEncode), $sLine); $sLine = \str_replace('{user:email}', $sEmail, $sLine);
$sLine = \str_replace('{user:login}', Utils::UrlEncode( $sLine = \str_replace('{user:login}', \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $sLine);
\MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $bUrlEncode), $sLine); $sLine = \str_replace('{user:domain}', \MailSo\Base\Utils::GetDomainFromEmail($sEmail), $sLine);
$sLine = \str_replace('{user:domain}', Utils::UrlEncode( $sLine = \str_replace('{user:domain-clear}',
\MailSo\Base\Utils::GetDomainFromEmail($sEmail), $bUrlEncode), $sLine); \MailSo\Base\Utils::GetClearDomainName(\MailSo\Base\Utils::GetDomainFromEmail($sEmail)),
$sLine = \str_replace('{user:domain-clear}', Utils::UrlEncode( $sLine);
\MailSo\Base\Utils::GetClearDomainName(
\MailSo\Base\Utils::GetDomainFromEmail($sEmail)), $bUrlEncode), $sLine);
} }
} }
@ -593,13 +591,13 @@ class Actions
{ {
$sLine = $this->oConfig->Get('logs', 'auth_logging_format', ''); $sLine = $this->oConfig->Get('logs', 'auth_logging_format', '');
if (!empty($sLine)) { if (!empty($sLine)) {
$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount, false, $aAdditionalParams), \LOG_WARNING); $this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount, $aAdditionalParams), \LOG_WARNING);
} }
if (($this->oConfig->Get('logs', 'auth_logging', false) || $this->oConfig->Get('logs', 'auth_syslog', false)) if (($this->oConfig->Get('logs', 'auth_logging', false) || $this->oConfig->Get('logs', 'auth_syslog', false))
&& \openlog('snappymail', 0, \LOG_AUTHPRIV)) { && \openlog('snappymail', 0, \LOG_AUTHPRIV)) {
\syslog(\LOG_ERR, $this->compileLogParams( \syslog(\LOG_ERR, $this->compileLogParams(
$admin ? 'Admin Auth failed: ip={request:ip} user={user:login}' : 'Auth failed: ip={request:ip} user={imap:login}', $admin ? 'Admin Auth failed: ip={request:ip} user={user:login}' : 'Auth failed: ip={request:ip} user={imap:login}',
$oAccount, false, $aAdditionalParams $oAccount, $aAdditionalParams
)); ));
\closelog(); \closelog();
} }

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

@ -104,11 +104,6 @@ class Utils
)); ));
} }
public static function UrlEncode(string $sV, bool $bEncode = false) : string
{
return $bEncode ? \urlencode($sV) : $sV;
}
public static function WebPath() : string public static function WebPath() : string
{ {
static $sAppPath; static $sAppPath;