the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 23:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sieve support login with OAUTHBEARER/XOAUTH2

Browse source
This commit is contained in:
djmaze 2021-10-22 15:31:56 +02:00
parent ed109740cd
commit 89f0e81194
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
View file

@ -115,6 +115,8 @@ class ManageSieveClient extends \MailSo\Net\NetClient
// 'SCRAM-SHA-256' => 1, // !$encrypted
// 'SCRAM-SHA-1' => 1, // !$encrypted
// 'CRAM-MD5' => 1, // $encrypted
'OAUTHBEARER' => $aCredentials['UseAuthOAuth2IfSupported'],
'XOAUTH2' => $aCredentials['UseAuthOAuth2IfSupported'],
'PLAIN' => 1, // $encrypted
'LOGIN' => 1 // $encrypted
];
@ -131,17 +133,17 @@ class ManageSieveClient extends \MailSo\Net\NetClient
$bAuth = false;
try
{
if ('PLAIN' === $type)
if ('PLAIN' === $type || 'OAUTHBEARER' === $type || 'XOAUTH2' === $type)
{
$sAuth = $SASL->authenticate($sLogin, $sPassword, $sLoginAuthKey);
if ($aCredentials['InitialAuthPlain'])
{
$this->sendRequest('AUTHENTICATE "PLAIN" "'.$sAuth.'"');
$this->sendRequest("AUTHENTICATE \"{$type}\" \"{$sAuth}\"");
}
else
{
$this->sendRequest('AUTHENTICATE "PLAIN" {'.\strlen($sAuth).'+}');
$this->sendRequest("AUTHENTICATE \"{$type}\" {".\strlen($sAuth).'+}');
$this->sendRequest($sAuth);
}