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

Improved SASL handling

Browse source
This commit is contained in:
the-djmaze 2024-03-25 19:31:57 +01:00
parent 40622d45b7
commit 31d929912a
4 changed files with 24 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

61
snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
View file

@ -176,37 +176,33 @@ class SmtpClient extends \MailSo\Net\NetClient
try
{
$sRequest = '';
if (\str_starts_with($type, 'SCRAM-')) {
// RFC 5802
$sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 234);
$sChallenge = $SASL->challenge($sResult);
$this->logMask($sChallenge);
$SASL->verify($this->sendRequestWithCheck($sChallenge, 235, true));
$sRequest = $SASL->challenge($sResult);
} else switch ($type) {
// RFC 4616
case 'PLAIN':
case 'XOAUTH2':
case 'OAUTHBEARER':
$sAuth = $SASL->authenticate($sLogin, $sPassword);
$this->logMask($sAuth);
$this->sendRequestWithCheck($sAuth, 235, true);
$sRequest = $SASL->authenticate($sLogin, $sPassword);
break;
case 'LOGIN':
$sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 334);
$sPassword = $SASL->challenge($sResult);
$this->logMask($sPassword);
$this->sendRequestWithCheck($sPassword, 235, true);
$sRequest = $SASL->challenge($sResult);
break;
// RFC 2195
case 'CRAM-MD5':
if (empty($sResult)) {
$this->writeLogException(new \MailSo\Smtp\Exceptions\NegativeResponseException);
}
$this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 235, true);
$sRequest = $SASL->authenticate($sLogin, $sPassword, $sResult);
break;
}
if ($sRequest) {
$this->logMask($sRequest);
$SASL->verify($this->sendRequestWithCheck($sRequest, 235));
}
}
catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException)
{
@ -286,7 +282,7 @@ class SmtpClient extends \MailSo\Net\NetClient
$sCmd .= ' NOTIFY=SUCCESS,FAILURE';
}
$this->sendRequestWithCheck("RCPT {$sCmd}", array(250, 251), false, "Failed to add recipient '{$sTo}'");
$this->sendRequestWithCheck("RCPT {$sCmd}", [250, 251], "Failed to add recipient '{$sTo}'");
$this->bRcpt = true;
@ -394,7 +390,7 @@ class SmtpClient extends \MailSo\Net\NetClient
*/
public function Rset() : self
{
$this->sendRequestWithCheck('RSET', array(250, 220));
$this->sendRequestWithCheck('RSET', [250, 220]);
$this->bMail = false;
$this->bRcpt = false;
@ -414,14 +410,10 @@ class SmtpClient extends \MailSo\Net\NetClient
/*
// RFC 6531
if ($this->hasCapability('SMTPUTF8')) {
$this->sendRequestWithCheck('VRFY ' . IDN::emailToUtf8($sUser) . ' SMTPUTF8',
array(250, 251, 252),
);
$this->sendRequestWithCheck('VRFY ' . IDN::emailToUtf8($sUser) . ' SMTPUTF8', [250, 251, 252]);
} else {
*/
$this->sendRequestWithCheck('VRFY ' . IDN::emailToAscii($sUser),
array(250, 251, 252)
);
$this->sendRequestWithCheck('VRFY ' . IDN::emailToAscii($sUser), [250, 251, 252]);
return $this;
}
@ -440,13 +432,10 @@ class SmtpClient extends \MailSo\Net\NetClient
$sUser = \MailSo\Base\Utils::Trim($sUser);
// RFC 6531
if ($this->hasCapability('SMTPUTF8')) {
$this->sendRequestWithCheck('EXPN ' . IDN::emailToUtf8($sUser) . ' SMTPUTF8',
array(250, 251, 252)
);
$this->sendRequestWithCheck('EXPN ' . IDN::emailToUtf8($sUser) . ' SMTPUTF8', [250, 251, 252]);
} else {
$this->sendRequestWithCheck('EXPN ' . IDN::emailToAscii($sUser),
array(250, 251, 252),
);
$this->sendRequestWithCheck('EXPN ' . IDN::emailToAscii($sUser), [250, 251, 252]);
}
return $this;
}
*/
@ -480,27 +469,15 @@ class SmtpClient extends \MailSo\Net\NetClient
* @throws \InvalidArgumentException
* @throws \MailSo\RuntimeException
* @throws \MailSo\Net\Exceptions\*
* @throws \MailSo\Smtp\Exceptions\*
*/
private function sendRequest(string $sCommand, bool $bSecureLog = false) : void
private function sendRequestWithCheck(string $sCommand, $mExpectCode, string $sErrorPrefix = '') : string
{
if (!\strlen(\trim($sCommand))) {
$this->writeLogException(new \InvalidArgumentException, \LOG_ERR);
}
$this->IsConnected(true);
$this->sendRaw($sCommand, true, $bSecureLog ? '********' : '');
}
/**
* @throws \InvalidArgumentException
* @throws \MailSo\RuntimeException
* @throws \MailSo\Net\Exceptions\*
* @throws \MailSo\Smtp\Exceptions\*
*/
private function sendRequestWithCheck(string $sCommand, $mExpectCode, bool $bSecureLog = false, string $sErrorPrefix = '') : string
{
$this->sendRequest($sCommand, $bSecureLog);
$this->sendRaw($sCommand, true, '');
$this->validateResponse($mExpectCode, $sErrorPrefix);
return empty($this->aResults[0]) ? '' : \trim(\substr($this->aResults[0], 4));
}

3
snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
View file

@ -18,9 +18,8 @@ abstract class SASL
return false;
}
public function verify(string $data) : bool
public function verify(string $data) : void
{
return false;
}
final public static function factory(string $type)

3
snappymail/v/0.0.0/app/libraries/snappymail/sasl/cram.php
View file

@ -20,6 +20,9 @@ class Cram extends \SnappyMail\SASL
?string $challenge = null
) : string
{
if (empty($challenge)) {
$this->writeLogException(new \MailSo\Smtp\Exceptions\NegativeResponseException);
}
return $this->encode($authcid . ' ' . \hash_hmac($this->algo, $this->decode($challenge), $passphrase));
}

3
snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
View file

@ -94,7 +94,7 @@ class Scram extends \SnappyMail\SASL
return true;
}
public function verify(string $data) : bool
public function verify(string $data) : void
{
$v = static::parseMessage($this->decode($data));
if (empty($v['v'])) {
@ -103,7 +103,6 @@ class Scram extends \SnappyMail\SASL
if (\base64_encode($this->server_key) !== $v['v']) {
throw new \Exception('Server signature invalid');
}
return true;
}
protected static function parseMessage(string $msg) : array