mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
More useful "auth_logging_format" setting
This commit is contained in:
parent
0035505659
commit
9cfb6a9452
5 changed files with 26 additions and 10 deletions
|
|
@ -40,7 +40,7 @@
|
||||||
"plugins"
|
"plugins"
|
||||||
],
|
],
|
||||||
"readmeFilename": "README.md",
|
"readmeFilename": "README.md",
|
||||||
"ownCloudPackageVersion": "4.1",
|
"ownCloudPackageVersion": "4.2",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.10.0"
|
"node": ">= 0.10.0"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -94,6 +94,11 @@ class Folder
|
||||||
if (0 < \strlen($this->sDelimiter))
|
if (0 < \strlen($this->sDelimiter))
|
||||||
{
|
{
|
||||||
$aNames = \explode($this->sDelimiter, $this->sFullNameRaw);
|
$aNames = \explode($this->sDelimiter, $this->sFullNameRaw);
|
||||||
|
if (false !== \array_search('', $aNames))
|
||||||
|
{
|
||||||
|
throw new \MailSo\Base\Exceptions\InvalidArgumentException();
|
||||||
|
}
|
||||||
|
|
||||||
$this->sNameRaw = \end($aNames);
|
$this->sNameRaw = \end($aNames);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -190,8 +190,15 @@ class FolderCollection extends \MailSo\Base\Collection
|
||||||
|
|
||||||
if (!isset($aSortedByLenImapFolders[$sNonExistenFolderFullNameRaw]))
|
if (!isset($aSortedByLenImapFolders[$sNonExistenFolderFullNameRaw]))
|
||||||
{
|
{
|
||||||
$aAddedFolders[$sNonExistenFolderFullNameRaw] =
|
try
|
||||||
Folder::NewNonExistenInstance($sNonExistenFolderFullNameRaw, $sDelimiter);
|
{
|
||||||
|
$aAddedFolders[$sNonExistenFolderFullNameRaw] =
|
||||||
|
Folder::NewNonExistenInstance($sNonExistenFolderFullNameRaw, $sDelimiter);
|
||||||
|
}
|
||||||
|
catch (\Exception $oExc)
|
||||||
|
{
|
||||||
|
unset($oExc);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1077,9 +1077,13 @@ class Actions
|
||||||
$this->oLoggerAuth->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME);
|
$this->oLoggerAuth->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME);
|
||||||
$this->oLoggerAuth->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME_DELTA);
|
$this->oLoggerAuth->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME_DELTA);
|
||||||
|
|
||||||
$this->oLoggerAuth->Add(
|
$oDriver = \MailSo\Log\Drivers\File::NewInstance($sAuthLogFileFullPath);
|
||||||
\MailSo\Log\Drivers\File::NewInstance($sAuthLogFileFullPath)
|
|
||||||
);
|
$oDriver->DisableTimePrefix();
|
||||||
|
$oDriver->DisableGuidPrefix();
|
||||||
|
$oDriver->DisableTypedPrefix();
|
||||||
|
|
||||||
|
$this->oLoggerAuth->Add($oDriver);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -221,7 +221,7 @@ Examples:
|
||||||
|
|
||||||
'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'),
|
'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'),
|
||||||
'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'),
|
'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'),
|
||||||
'auth_logging_format' => array('Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}')
|
'auth_logging_format' => array('[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}')
|
||||||
),
|
),
|
||||||
|
|
||||||
'debug' => array(
|
'debug' => array(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue