66506c9fd6
This is a feature and maintenance release introducing full support for [https://www.rfc-editor.org/rfc/rfc6531 RFC 6531 SMTPUTF8], meaning that plugin or theme developers are now free to use Unicode characters in email addresses, such as `JøeÜser@example.com`, without any complicated encoding schemes. Using this feature requires sending through a mail server that advertises support for SMTPUTF8. For full details see [https://github.com/PHPMailer/PHPMailer/blob/master/SMTPUTF8.md SMTPUTF8.md]. This commit also includes the parts of PHPMailer not previously bundled with core, specifically the DSNConfigurator, OAuth, and POP3 classes, so that plugin developers could use those extended features without including their own versions of the library. Including the full library aims to make it easier (and faster) for core to update in case of security issues, and to provide more flexibility and security for plugins and (by extension) users of WordPress. References: * [https://github.com/PHPMailer/PHPMailer/releases/tag/v6.10.0 PHPMailer 6.10.0 release notes] * [https://github.com/PHPMailer/PHPMailer/compare/v6.9.3...v6.10.0 Full list of changes in PHPMailer 6.10.0] Follow-up to [54937], [55557], [56484], [57137], [59246], [59481]. Props agulbra, Ipstenu, JeffMatson, lukecavanagh, dd32, Otto42, JeffMatson, MattyRob, desrosj, SirLouen, SergeyBiryukov. Fixes #39714, #63811. Built from https://develop.svn.wordpress.org/trunk@60623 git-svn-id: http://core.svn.wordpress.org/trunk@59959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
140 lines
3.7 KiB
PHP
140 lines
3.7 KiB
PHP
<?php
|
|
|
|
/**
|
|
* PHPMailer - PHP email creation and transport class.
|
|
* PHP Version 5.5.
|
|
*
|
|
* @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
|
|
*
|
|
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
|
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
|
* @author Brent R. Matzelle (original founder)
|
|
* @copyright 2012 - 2020 Marcus Bointon
|
|
* @copyright 2010 - 2012 Jim Jagielski
|
|
* @copyright 2004 - 2009 Andy Prevost
|
|
* @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
|
|
* @note This program is distributed in the hope that it will be useful - WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
namespace PHPMailer\PHPMailer;
|
|
|
|
use League\OAuth2\Client\Grant\RefreshToken;
|
|
use League\OAuth2\Client\Provider\AbstractProvider;
|
|
use League\OAuth2\Client\Token\AccessToken;
|
|
|
|
/**
|
|
* OAuth - OAuth2 authentication wrapper class.
|
|
* Uses the oauth2-client package from the League of Extraordinary Packages.
|
|
*
|
|
* @see https://oauth2-client.thephpleague.com
|
|
*
|
|
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
*/
|
|
class OAuth implements OAuthTokenProvider
|
|
{
|
|
/**
|
|
* An instance of the League OAuth Client Provider.
|
|
*
|
|
* @var AbstractProvider
|
|
*/
|
|
protected $provider;
|
|
|
|
/**
|
|
* The current OAuth access token.
|
|
*
|
|
* @var AccessToken
|
|
*/
|
|
protected $oauthToken;
|
|
|
|
/**
|
|
* The user's email address, usually used as the login ID
|
|
* and also the from address when sending email.
|
|
*
|
|
* @var string
|
|
*/
|
|
protected $oauthUserEmail = '';
|
|
|
|
/**
|
|
* The client secret, generated in the app definition of the service you're connecting to.
|
|
*
|
|
* @var string
|
|
*/
|
|
protected $oauthClientSecret = '';
|
|
|
|
/**
|
|
* The client ID, generated in the app definition of the service you're connecting to.
|
|
*
|
|
* @var string
|
|
*/
|
|
protected $oauthClientId = '';
|
|
|
|
/**
|
|
* The refresh token, used to obtain new AccessTokens.
|
|
*
|
|
* @var string
|
|
*/
|
|
protected $oauthRefreshToken = '';
|
|
|
|
/**
|
|
* OAuth constructor.
|
|
*
|
|
* @param array $options Associative array containing
|
|
* `provider`, `userName`, `clientSecret`, `clientId` and `refreshToken` elements
|
|
*/
|
|
public function __construct($options)
|
|
{
|
|
$this->provider = $options['provider'];
|
|
$this->oauthUserEmail = $options['userName'];
|
|
$this->oauthClientSecret = $options['clientSecret'];
|
|
$this->oauthClientId = $options['clientId'];
|
|
$this->oauthRefreshToken = $options['refreshToken'];
|
|
}
|
|
|
|
/**
|
|
* Get a new RefreshToken.
|
|
*
|
|
* @return RefreshToken
|
|
*/
|
|
protected function getGrant()
|
|
{
|
|
return new RefreshToken();
|
|
}
|
|
|
|
/**
|
|
* Get a new AccessToken.
|
|
*
|
|
* @return AccessToken
|
|
*/
|
|
protected function getToken()
|
|
{
|
|
return $this->provider->getAccessToken(
|
|
$this->getGrant(),
|
|
['refresh_token' => $this->oauthRefreshToken]
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Generate a base64-encoded OAuth token.
|
|
*
|
|
* @return string
|
|
*/
|
|
public function getOauth64()
|
|
{
|
|
//Get a new token if it's not available or has expired
|
|
if (null === $this->oauthToken || $this->oauthToken->hasExpired()) {
|
|
$this->oauthToken = $this->getToken();
|
|
}
|
|
|
|
return base64_encode(
|
|
'user=' .
|
|
$this->oauthUserEmail .
|
|
"\001auth=Bearer " .
|
|
$this->oauthToken .
|
|
"\001\001"
|
|
);
|
|
}
|
|
}
|