mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for maximum command size during XOAUTH2 authentication

This commit is contained in:
LE MOINE Laurent 2025-06-18 11:01:34 +02:00
parent 912f278a48
commit 8ca031797f
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/SMTP.php
View File

@ -634,9 +634,36 @@ class SMTP
}
$oauth = $OAuth->getOauth64();
//Start authentication
if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
return false;
/*
* The maximum length for an SMTP commands is 512 bytes, according to RFC 4954 (https://datatracker.ietf.org/doc/html/rfc4954).
* (In truth this seems more complex than that, but 512 bytes seems to be the stricter limit)
*
* Therefor, the base64-encoded OAUTH token has a maximum length of 497 : 512 - 13 (AUTH XOAUTH2) - 2 (CRLF)
* If the token is longer than that, the command and the token must be sent separately
*/
if (strlen($oauth) <= 497) {
//Start authentication
if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
return false;
}
} else {
// Send the command and expect a code 334
if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2', 334)) {
return false;
}
// Send the token
if (!$this->sendCommand('Oauth TOKEN', $oauth, [235, 334])) {
return false;
}
// If the server answer with a code 334, send and empty line an wait for a code 235
if (
substr($this->last_reply, 0, 3) == 334
&& $this->sendCommand('AUTH End', '', 235)
) {
return false;
}
}
break;
default: