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

SASL always base64 by default

Browse source
This commit is contained in:
the-djmaze 2023-03-21 18:56:48 +01:00
parent 7105e23781
commit 30c95ac04e
4 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -146,7 +146,6 @@ class ImapClient extends \MailSo\Net\NetClient
} }
$SASL = \SnappyMail\SASL::factory($type); $SASL = \SnappyMail\SASL::factory($type);
$SASL->base64 = true;
try try
{ {

1
snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
View file

@ -107,7 +107,6 @@ class SieveClient extends \MailSo\Net\NetClient
} }
$SASL = \SnappyMail\SASL::factory($type); $SASL = \SnappyMail\SASL::factory($type);
$SASL->base64 = true;
$bAuth = false; $bAuth = false;
try try

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

@ -136,7 +136,6 @@ class SmtpClient extends \MailSo\Net\NetClient
if ($this->Settings->authPlainLine) { if ($this->Settings->authPlainLine) {
// https://github.com/the-djmaze/snappymail/issues/1038 // https://github.com/the-djmaze/snappymail/issues/1038
$SASL = \SnappyMail\SASL::factory('PLAIN'); $SASL = \SnappyMail\SASL::factory('PLAIN');
$SASL->base64 = true;
try try
{ {
$sResult = $this->sendRequestWithCheck('AUTH', 235, 'PLAIN ' . $SASL->authenticate($sLogin, $sPassword)); $sResult = $this->sendRequestWithCheck('AUTH', 235, 'PLAIN ' . $SASL->authenticate($sLogin, $sPassword));
@ -150,7 +149,6 @@ class SmtpClient extends \MailSo\Net\NetClient
} else { } else {
// Start authentication // Start authentication
$SASL = \SnappyMail\SASL::factory($type); $SASL = \SnappyMail\SASL::factory($type);
$SASL->base64 = true;
try try
{ {

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

@ -4,7 +4,7 @@ namespace SnappyMail;
abstract class SASL abstract class SASL
{ {
public bool $base64 = false; public bool $base64 = true;
abstract public function authenticate(string $authcid, string $passphrase, ?string $authzid = null) : string; abstract public function authenticate(string $authcid, string $passphrase, ?string $authzid = null) : string;