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

Revamp for #351

Browse source
This commit is contained in:
the-djmaze 2022-04-29 11:30:11 +02:00
parent 3522f76d37
commit 1dccfdba3b
4 changed files with 95 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

207
plugins/change-password/drivers/poppassd.php
View file

@ -1,207 +0,0 @@
<?php
class ChangePasswordDriverISPConfig
{
const
NAME = 'Poppassd',
DESCRIPTION = 'Change passwords using Poppassd.';
private
$oConfig = null,
$oLogger = null;
function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
{
$this->oConfig = $oConfig;
$this->oLogger = $oLogger;
}
public static function isSupported() : bool
{
return true;
}
public static function configMapping() : array
{
return array(
\RainLoop\Plugins\Property::NewInstance('poppassd_host')->SetLabel('POPPASSD Host')
->SetDefaultValue('127.0.0.1'),
\RainLoop\Plugins\Property::NewInstance('poppassd_port')->SetLabel('POPPASSD Port')
->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
->SetDefaultValue(106),
\RainLoop\Plugins\Property::NewInstance('poppassd_allowed_emails')->SetLabel('Allowed emails')
->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
->SetDefaultValue('*')
);
}
public function ChangePassword(\RainLoop\Model\Account $oAccount, string $sPrevPassword, string $sNewPassword) : bool
{
if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'poppassd_allowed_emails', ''))) {
return false;
}
try
{
$oPoppassdClient = new PoppassdClient();
if ($this->oLogger) {
$oPoppassdClient->SetLogger($this->oLogger);
}
$oPoppassdClient->Connect(
$this->oConfig->Get('plugin', 'poppassd_host', ''),
(int) $this->oConfig->Get('plugin', 'poppassd_port', 106)
);
$oPoppassdClient->Login($oAccount->Login(), $sPrevPassword)
->NewPass($sNewPassword)
->Disconnect()
;
return true;
}
catch (\Throwable $oException)
{
}
return false;
}
}
class PoppassdClient extends \MailSo\Net\NetClient
{
private
$bIsLoggined = false,
$iRequestTime = 0;
public function Connect(string $sServerName, int $iPort,
int $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
bool $bVerifySsl = false, bool $bAllowSelfSigned = true,
string $sClientCert = '') : void
{
$this->iRequestTime = \microtime(true);
parent::Connect($sServerName, $iPort, $iSecurityType, $bVerifySsl, $bAllowSelfSigned, $sClientCert);
$this->validateResponse();
}
public function Login(string $sLogin, string $sPassword) : self
{
if ($this->bIsLoggined) {
$this->writeLogException(
new \RuntimeException('Already authenticated for this session'),
\MailSo\Log\Enumerations\Type::ERROR, true);
}
$sLogin = \trim($sLogin);
$sPassword = $sPassword;
try
{
$this->sendRequestWithCheck('user', $sLogin, true);
$this->sendRequestWithCheck('pass', $sPassword, true);
}
catch (\Throwable $oException)
{
$this->writeLogException($oException, \MailSo\Log\Enumerations\Type::NOTICE, true);
}
$this->bIsLoggined = true;
return $this;
}
public function Logout() : void
{
if ($this->bIsLoggined) {
$this->sendRequestWithCheck('quit');
}
$this->bIsLoggined = false;
}
public function NewPass(string $sNewPassword) : self
{
if ($this->bIsLoggined) {
$this->sendRequestWithCheck('newpass', $sNewPassword);
} else {
$this->writeLogException(
new \RuntimeException('Required login'),
\MailSo\Log\Enumerations\Type::ERROR, true);
}
return $this;
}
private function secureRequestParams($sCommand, $sAddToCommand) : ?string
{
if (\strlen($sAddToCommand)) {
switch (\strtolower($sCommand))
{
case 'pass':
case 'newpass':
return '********';
}
}
return null;
}
private function sendRequest(string $sCommand, string $sAddToCommand = '') : self
{
if (!\strlen(\trim($sCommand))) {
$this->writeLogException(
new \MailSo\Base\Exceptions\InvalidArgumentException(),
\MailSo\Log\Enumerations\Type::ERROR, true);
}
$this->IsConnected(true);
$sCommand = \trim($sCommand);
$sRealCommand = $sCommand . (\strlen($sAddToCommand) ? ' '.$sAddToCommand : '');
$sFakeCommand = '';
$sFakeAddToCommand = $this->secureRequestParams($sCommand, $sAddToCommand);
if (\strlen($sFakeAddToCommand)) {
$sFakeCommand = $sCommand . ' ' . $sFakeAddToCommand;
}
$this->iRequestTime = \microtime(true);
$this->sendRaw($sRealCommand, true, $sFakeCommand);
return $this;
}
private function sendRequestWithCheck(string $sCommand, string $sAddToCommand = '', bool $bAuthRequestValidate = false) : self
{
$this->sendRequest($sCommand, $sAddToCommand);
$this->validateResponse($bAuthRequestValidate);
return $this;
}
private function validateResponse(bool $bAuthRequestValidate = false) : self
{
$this->getNextBuffer();
$bResult = \preg_match($bAuthRequestValidate ? '/^[23]\d\d/' : '/^2\d\d/', trim($this->sResponseBuffer));
if (!$bResult) {
// POP3 validation hack
$bResult = '+OK ' === \substr(\trim($this->sResponseBuffer), 0, 4);
}
if (!$bResult) {
$this->writeLogException(
new \MailSo\Base\Exceptions\Exception(),
\MailSo\Log\Enumerations\Type::WARNING, true);
}
$this->writeLog((\microtime(true) - $this->iRequestTime),
\MailSo\Log\Enumerations\Type::TIME);
return $this;
}
function getLogName() : string
{
return 'POPPASSD';
}
}

20
plugins/change-password/index.php
View file

@ -52,7 +52,6 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
}
}
} else {
// foreach (\glob(__DIR__ . '/../change-password-*', GLOB_ONLYDIR) as $file) {
foreach (\glob(__DIR__ . '/drivers/*.php') as $file) {
$name = \basename($file, '.php');
$class = 'ChangePasswordDriver' . $name;
@ -71,6 +70,25 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
}
}
}
foreach (\glob(__DIR__ . '/../change-password-*', GLOB_ONLYDIR) as $file) {
$name = \str_replace('change-password-', '', \basename($file));
$class = "ChangePassword{$name}Driver";
$file .= '/driver.php';
try
{
if (\is_readable($file) && ($all || $this->Config()->Get('plugin', "driver_{$name}_enabled", false))) {
require_once $file;
if ($class::isSupported()) {
yield $name => $class;
}
}
}
catch (\Throwable $oException)
{
\trigger_error("ERROR {$class}: " . $oException->getMessage());
}
}
}
public function Supported() : string