the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-10-06 11:45:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Improve solution for #758 and #759

Browse source
This commit is contained in:
the-djmaze 2022-12-08 12:13:35 +01:00
parent a2ec25fbd4
commit 33a4692c06
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,9 +21,6 @@ abstract class SASL
final public static function factory(string $type) final public static function factory(string $type)
{ {
if (\preg_match('/^([A-Z2]+)(?:-(.+))?$/Di', $type, $m)) { if (\preg_match('/^([A-Z2]+)(?:-(.+))?$/Di', $type, $m)) {
if ('XOAUTH2' === $m[1] || 'OAUTHBEARER' === $m[1]) {
$m[1] = 'OAUTH';
}
$class = __CLASS__ . "\\{$m[1]}"; $class = __CLASS__ . "\\{$m[1]}";
if (\class_exists($class) && $class::isSupported($m[2] ?? '')) { if (\class_exists($class) && $class::isSupported($m[2] ?? '')) {
return new $class($m[2] ?? ''); return new $class($m[2] ?? '');
@ -35,9 +32,6 @@ abstract class SASL
public static function isSupported(string $type) : bool public static function isSupported(string $type) : bool
{ {
if (\preg_match('/^([A-Z2]+)(?:-(.+))?$/Di', $type, $m)) { if (\preg_match('/^([A-Z2]+)(?:-(.+))?$/Di', $type, $m)) {
if ('XOAUTH2' === $m[1] || 'OAUTHBEARER' === $m[1]) {
$m[1] = 'OAUTH';
}
$class = __CLASS__ . "\\{$m[1]}"; $class = __CLASS__ . "\\{$m[1]}";
return \class_exists($class) && $class::isSupported($m[2] ?? ''); return \class_exists($class) && $class::isSupported($m[2] ?? '');
} }

2
snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauth.php → snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php
View file

@ -7,7 +7,7 @@
namespace SnappyMail\SASL; namespace SnappyMail\SASL;
class OAuth extends \SnappyMail\SASL class OAuthBearer extends \SnappyMail\SASL
{ {
public function authenticate(string $username, string $passphrase, ?string $authzid = null) : string public function authenticate(string $username, string $passphrase, ?string $authzid = null) : string
{ {

21
snappymail/v/0.0.0/app/libraries/snappymail/sasl/xoauth2.php Normal file
View file

@ -0,0 +1,21 @@
<?php
/**
* https://datatracker.ietf.org/doc/html/rfc7628
* https://developers.google.com/gmail/imap/xoauth2-protocol
*/
namespace SnappyMail\SASL;
class XOAuth2 extends \SnappyMail\SASL
{
public function authenticate(string $username, string $passphrase, ?string $authzid = null) : string
{
return $this->encode("user={$username}\x01auth=Bearer {$passphrase}\x01\x01");
}
public static function isSupported(string $param) : bool
{
return true;
}
}