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

Bugfix and improved

Browse source
This commit is contained in:
the-djmaze 2023-01-19 10:55:01 +01:00
parent 890fe132e1
commit b3a969fb8a
1 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

79
plugins/override-smtp-credentials/index.php
View file

@ -4,18 +4,58 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
const const
NAME = 'Override SMTP Credentials', NAME = 'Override SMTP Credentials',
VERSION = '2.3', VERSION = '2.4',
RELEASE = '2022-11-11', RELEASE = '2023-01-19',
REQUIRED = '2.21.0', REQUIRED = '2.23.0',
CATEGORY = 'Filters', CATEGORY = 'Filters',
DESCRIPTION = 'Override SMTP credentials for specific users.'; DESCRIPTION = 'Override SMTP credentials for specific users.';
public function Init() : void public function Init() : void
{ {
$this->addHook('smtp.before-connect', 'FilterSmtpCredentials'); $this->addHook('smtp.before-connect', 'FilterSmtpConnect');
$this->addHook('smtp.before-login', 'FilterSmtpCredentials'); $this->addHook('smtp.before-login', 'FilterSmtpCredentials');
} }
/**
* @param \RainLoop\Model\Account $oAccount
* @param \MailSo\Smtp\SmtpClient $oSmtpClient
* @param \MailSo\Smtp\Settings $oSettings
*/
public function FilterSmtpConnect(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
{
$sEmail = $oAccount->Email();
$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
$sFoundValue = '';
if (\strlen($sWhiteList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList, $sFoundValue)) {
\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} matched {$sFoundValue}");
$oSettings->usePhpMail = false;
$sHost = \trim($this->Config()->Get('plugin', 'smtp_host', ''));
if (\strlen($sHost)) {
$oSettings->host = $sHost;
$oSettings->port = (int) $this->Config()->Get('plugin', 'smtp_port', 25);
$sSecure = \trim($this->Config()->Get('plugin', 'smtp_secure', 'None'));
switch ($sSecure)
{
case 'SSL':
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::SSL;
break;
case 'TLS':
case 'STARTTLS':
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS;
break;
case 'Detect':
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT;
break;
default:
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
break;
}
}
} else {
\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} no match");
}
}
/** /**
* @param \RainLoop\Model\Account $oAccount * @param \RainLoop\Model\Account $oAccount
* @param \MailSo\Smtp\SmtpClient $oSmtpClient * @param \MailSo\Smtp\SmtpClient $oSmtpClient
@ -23,40 +63,13 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
*/ */
public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings) public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
{ {
$sEmail = $oAccount->Email();
$sHost = \trim($this->Config()->Get('plugin', 'smtp_host', ''));
$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', '')); $sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
$sFoundValue = ''; $sFoundValue = '';
if (0 < strlen($sWhiteList) && 0 < \strlen($sHost) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList, $sFoundValue)) if (\strlen($sWhiteList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $sWhiteList, $sFoundValue)) {
{
\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} matched {$sFoundValue}");
$oSettings->host = $sHost;
$oSettings->port = (int) $this->Config()->Get('plugin', 'smtp_port', 25);
$sSecure = \trim($this->Config()->Get('plugin', 'smtp_secure', 'None'));
switch ($sSecure)
{
case 'SSL':
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::SSL;
break;
case 'TLS':
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS;
break;
default:
$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
break;
}
$oSettings->useAuth = (bool) $this->Config()->Get('plugin', 'smtp_auth', true); $oSettings->useAuth = (bool) $this->Config()->Get('plugin', 'smtp_auth', true);
$oSettings->Login = \trim($this->Config()->Get('plugin', 'smtp_user', '')); $oSettings->Login = \trim($this->Config()->Get('plugin', 'smtp_user', ''));
$oSettings->Password = (string) $this->Config()->Get('plugin', 'smtp_password', ''); $oSettings->Password = (string) $this->Config()->Get('plugin', 'smtp_password', '');
} }
else
{
\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} no match");
}
} }
/** /**
@ -72,7 +85,7 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
->SetDefaultValue(25), ->SetDefaultValue(25),
\RainLoop\Plugins\Property::NewInstance('smtp_secure')->SetLabel('SMTP Secure') \RainLoop\Plugins\Property::NewInstance('smtp_secure')->SetLabel('SMTP Secure')
->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION) ->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
->SetDefaultValue(array('None', 'SSL', 'TLS')), ->SetDefaultValue(array('None', 'Detect', 'SSL', 'STARTTLS')),
\RainLoop\Plugins\Property::NewInstance('smtp_auth')->SetLabel('Use auth') \RainLoop\Plugins\Property::NewInstance('smtp_auth')->SetLabel('Use auth')
->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL) ->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
->SetDefaultValue(true), ->SetDefaultValue(true),