WordPress.org

Make WordPress Core

Changeset 39646


Ignore:
Timestamp:
12/29/2016 02:59:24 AM (17 months ago)
Author:
dd32
Message:

Upgrade PHPMailer from 5.2.14 to 5.2.21.

The full list of changes is available here:
https://github.com/PHPMailer/PHPMailer/compare/v5.2.14...v5.2.21

Props sebastian.pisula, MattyRob, sfpt, dd32, peterwilsoncc, voldemortensen.
Merges [39645] to the 4.7 branch.
Fixes #37210 for trunk.

Location:
branches/4.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

  • branches/4.7/src/wp-includes/class-phpmailer.php

    r38470 r39646  
    3232     * @var string
    3333     */
    34     public $Version = '5.2.14';
     34    public $Version = '5.2.21';
    3535
    3636    /**
     
    202202     * An ID to be used in the Message-ID header.
    203203     * If empty, a unique id will be generated.
     204     * You can set your own, but it must be in the format "<id@domain>",
     205     * as defined in RFC5322 section 3.6.4 or it will be ignored.
     206     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
    204207     * @var string
    205208     */
     
    286289    /**
    287290     * SMTP auth type.
    288      * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
     291     * Options are CRAM-MD5, LOGIN, PLAIN, attempted in that order if not specified
    289292     * @var string
    290293     */
     
    353356     * Whether to split multiple to addresses into multiple messages
    354357     * or send them all in one message.
     358     * Only supported in `mail` and `sendmail` transports, not in SMTP.
    355359     * @var boolean
    356360     */
     
    395399    /**
    396400     * DKIM Identity.
    397      * Usually the email address used as the source of the email
     401     * Usually the email address used as the source of the email.
    398402     * @var string
    399403     */
     
    419423     */
    420424    public $DKIM_private = '';
     425
     426    /**
     427     * DKIM private key string.
     428     * If set, takes precedence over `$DKIM_private`.
     429     * @var string
     430     */
     431    public $DKIM_private_string = '';
    421432
    422433    /**
     
    448459
    449460    /**
     461     * Which validator to use by default when validating email addresses.
     462     * May be a callable to inject your own validator, but there are several built-in validators.
     463     * @see PHPMailer::validateAddress()
     464     * @var string|callable
     465     * @static
     466     */
     467    public static $validator = 'auto';
     468
     469    /**
    450470     * An instance of the SMTP sender class.
    451471     * @var SMTP
     
    635655     * @param boolean $exceptions Should we throw external exceptions?
    636656     */
    637     public function __construct($exceptions = false)
    638     {
    639         $this->exceptions = (boolean)$exceptions;
     657    public function __construct($exceptions = null)
     658    {
     659        if ($exceptions !== null) {
     660            $this->exceptions = (boolean)$exceptions;
     661        }
    640662    }
    641663
     
    646668    {
    647669        //Close any open SMTP connection nicely
    648         if ($this->Mailer == 'smtp') {
    649             $this->smtpClose();
    650         }
     670        $this->smtpClose();
    651671    }
    652672
     
    672692            $subject = $this->encodeHeader($this->secureHeader($subject));
    673693        }
    674         if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
     694
     695        //Can't use additional_parameters in safe_mode, calling mail() with null params breaks
     696        //@link http://php.net/manual/en/function.mail.php
     697        if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
    675698            $result = @mail($to, $subject, $body, $header);
    676699        } else {
     
    679702        return $result;
    680703    }
    681 
    682704    /**
    683705     * Output debugging info via user-defined method.
     
    714736            default:
    715737                //Normalize line breaks
    716                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
     738                $str = preg_replace('/\r\n?/ms', "\n", $str);
    717739                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
    718740                    "\n",
     
    851873        if (($pos = strrpos($address, '@')) === false) {
    852874            // At-sign is misssing.
    853             $error_message = $this->lang('invalid_address') . $address;
     875            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
    854876            $this->setError($error_message);
    855877            $this->edebug($error_message);
     
    901923        }
    902924        if (!$this->validateAddress($address)) {
    903             $error_message = $this->lang('invalid_address') . $address;
     925            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
    904926            $this->setError($error_message);
    905927            $this->edebug($error_message);
     
    922944        }
    923945        return false;
     946    }
     947
     948    /**
     949     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
     950     * of the form "display name <address>" into an array of name/address pairs.
     951     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
     952     * Note that quotes in the name part are removed.
     953     * @param string $addrstr The address list string
     954     * @param bool $useimap Whether to use the IMAP extension to parse the list
     955     * @return array
     956     * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
     957     */
     958    public function parseAddresses($addrstr, $useimap = true)
     959    {
     960        $addresses = array();
     961        if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
     962            //Use this built-in parser if it's available
     963            $list = imap_rfc822_parse_adrlist($addrstr, '');
     964            foreach ($list as $address) {
     965                if ($address->host != '.SYNTAX-ERROR.') {
     966                    if ($this->validateAddress($address->mailbox . '@' . $address->host)) {
     967                        $addresses[] = array(
     968                            'name' => (property_exists($address, 'personal') ? $address->personal : ''),
     969                            'address' => $address->mailbox . '@' . $address->host
     970                        );
     971                    }
     972                }
     973            }
     974        } else {
     975            //Use this simpler parser
     976            $list = explode(',', $addrstr);
     977            foreach ($list as $address) {
     978                $address = trim($address);
     979                //Is there a separate name part?
     980                if (strpos($address, '<') === false) {
     981                    //No separate name, just use the whole thing
     982                    if ($this->validateAddress($address)) {
     983                        $addresses[] = array(
     984                            'name' => '',
     985                            'address' => $address
     986                        );
     987                    }
     988                } else {
     989                    list($name, $email) = explode('<', $address);
     990                    $email = trim(str_replace('>', '', $email));
     991                    if ($this->validateAddress($email)) {
     992                        $addresses[] = array(
     993                            'name' => trim(str_replace(array('"', "'"), '', $name)),
     994                            'address' => $email
     995                        );
     996                    }
     997                }
     998            }
     999        }
     1000        return $addresses;
    9241001    }
    9251002
     
    9401017            (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and
    9411018            !$this->validateAddress($address)) {
    942             $error_message = $this->lang('invalid_address') . $address;
     1019            $error_message = $this->lang('invalid_address') . " (setFrom) $address";
    9431020            $this->setError($error_message);
    9441021            $this->edebug($error_message);
     
    9731050     * Check that a string looks like an email address.
    9741051     * @param string $address The email address to check
    975      * @param string $patternselect A selector for the validation pattern to use :
     1052     * @param string|callable $patternselect A selector for the validation pattern to use :
    9761053     * * `auto` Pick best pattern automatically;
    9771054     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
     
    9801057     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
    9811058     * * `noregex` Don't use a regex: super fast, really dumb.
     1059     * Alternatively you may pass in a callable to inject your own validator, for example:
     1060     * PHPMailer::validateAddress('user@example.com', function($address) {
     1061     *     return (strpos($address, '@') !== false);
     1062     * });
     1063     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
    9821064     * @return boolean
    9831065     * @static
    9841066     * @access public
    9851067     */
    986     public static function validateAddress($address, $patternselect = 'auto')
    987     {
     1068    public static function validateAddress($address, $patternselect = null)
     1069    {
     1070        if (is_null($patternselect)) {
     1071            $patternselect = self::$validator;
     1072        }
     1073        if (is_callable($patternselect)) {
     1074            return call_user_func($patternselect, $address);
     1075        }
    9881076        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
    9891077        if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
     
    11621250                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
    11631251                if (!$this->validateAddress($this->$address_kind)) {
    1164                     $error_message = $this->lang('invalid_address') . $this->$address_kind;
     1252                    $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind;
    11651253                    $this->setError($error_message);
    11661254                    $this->edebug($error_message);
     
    11731261
    11741262            // Set whether the message is multipart/alternative
    1175             if (!empty($this->AltBody)) {
     1263            if ($this->alternativeExists()) {
    11761264                $this->ContentType = 'multipart/alternative';
    11771265            }
     
    12071295            // Sign with DKIM if enabled
    12081296            if (!empty($this->DKIM_domain)
    1209                 && !empty($this->DKIM_private)
    12101297                && !empty($this->DKIM_selector)
    1211                 && file_exists($this->DKIM_private)) {
     1298                && (!empty($this->DKIM_private_string)
     1299                   || (!empty($this->DKIM_private) && file_exists($this->DKIM_private))
     1300                )
     1301            ) {
    12121302                $header_dkim = $this->DKIM_Add(
    12131303                    $this->MIMEHeader . $this->mailHeader,
     
    12751365    protected function sendmailSend($header, $body)
    12761366    {
    1277         if ($this->Sender != '') {
     1367        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
     1368        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
    12781369            if ($this->Mailer == 'qmail') {
    1279                 $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
     1370                $sendmailFmt = '%s -f%s';
    12801371            } else {
    1281                 $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
     1372                $sendmailFmt = '%s -oi -f%s -t';
    12821373            }
    12831374        } else {
    12841375            if ($this->Mailer == 'qmail') {
    1285                 $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
     1376                $sendmailFmt = '%s';
    12861377            } else {
    1287                 $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
    1288             }
    1289         }
     1378                $sendmailFmt = '%s -oi -t';
     1379            }
     1380        }
     1381
     1382        // TODO: If possible, this should be changed to escapeshellarg.  Needs thorough testing.
     1383        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
     1384
    12901385        if ($this->SingleTo) {
    12911386            foreach ($this->SingleToArray as $toAddr) {
     
    13341429
    13351430    /**
     1431     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
     1432     *
     1433     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
     1434     * @param string $string The string to be validated
     1435     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
     1436     * @access protected
     1437     * @return boolean
     1438     */
     1439    protected static function isShellSafe($string)
     1440    {
     1441        // Future-proof
     1442        if (escapeshellcmd($string) !== $string
     1443            or !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))
     1444        ) {
     1445            return false;
     1446        }
     1447
     1448        $length = strlen($string);
     1449
     1450        for ($i = 0; $i < $length; $i++) {
     1451            $c = $string[$i];
     1452
     1453            // All other characters have a special meaning in at least one common shell, including = and +.
     1454            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
     1455            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
     1456            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
     1457                return false;
     1458            }
     1459        }
     1460
     1461        return true;
     1462    }
     1463
     1464    /**
    13361465     * Send mail using the PHP mail() function.
    13371466     * @param string $header The message headers
     
    13501479        $to = implode(', ', $toArr);
    13511480
    1352         if (empty($this->Sender)) {
    1353             $params = ' ';
    1354         } else {
    1355             $params = sprintf('-f%s', $this->Sender);
    1356         }
    1357         if ($this->Sender != '' and !ini_get('safe_mode')) {
     1481        $params = null;
     1482        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
     1483        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
     1484            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
     1485            if (self::isShellSafe($this->Sender)) {
     1486                $params = sprintf('-f%s', $this->Sender);
     1487            }
     1488        }
     1489        if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
    13581490            $old_from = ini_get('sendmail_from');
    13591491            ini_set('sendmail_from', $this->Sender);
    13601492        }
    13611493        $result = false;
    1362         if ($this->SingleTo && count($toArr) > 1) {
     1494        if ($this->SingleTo and count($toArr) > 1) {
    13631495            foreach ($toArr as $toAddr) {
    13641496                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
     
    14101542            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
    14111543        }
    1412         if ('' == $this->Sender) {
     1544        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
     1545            $smtp_from = $this->Sender;
     1546        } else {
    14131547            $smtp_from = $this->From;
    1414         } else {
    1415             $smtp_from = $this->Sender;
    14161548        }
    14171549        if (!$this->smtp->mail($smtp_from)) {
     
    14671599     * @return boolean
    14681600     */
    1469     public function smtpConnect($options = array())
     1601    public function smtpConnect($options = null)
    14701602    {
    14711603        if (is_null($this->smtp)) {
    14721604            $this->smtp = $this->getSMTPInstance();
     1605        }
     1606
     1607        //If no options are provided, use whatever is set in the instance
     1608        if (is_null($options)) {
     1609            $options = $this->SMTPOptions;
    14731610        }
    14741611
     
    15421679                            throw new phpmailerException($this->lang('connect_host'));
    15431680                        }
    1544                         // We must resend HELO after tls negotiation
     1681                        // We must resend EHLO after TLS negotiation
    15451682                        $this->smtp->hello($hello);
    15461683                    }
     
    15811718    public function smtpClose()
    15821719    {
    1583         if ($this->smtp !== null) {
     1720        if (is_a($this->smtp, 'SMTP')) {
    15841721            if ($this->smtp->connected()) {
    15851722                $this->smtp->quit();
     
    16001737    public function setLanguage($langcode = 'en', $lang_path = '')
    16011738    {
     1739        // Backwards compatibility for renamed language codes
     1740        $renamed_langcodes = array(
     1741            'br' => 'pt_br',
     1742            'cz' => 'cs',
     1743            'dk' => 'da',
     1744            'no' => 'nb',
     1745            'se' => 'sv',
     1746        );
     1747
     1748        if (isset($renamed_langcodes[$langcode])) {
     1749            $langcode = $renamed_langcodes[$langcode];
     1750        }
     1751
    16021752        // Define full set of translatable strings in English
    16031753        $PHPMAILER_LANG = array(
     
    16251775            // Calculate an absolute path so it can work if CWD is not here
    16261776            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
     1777        }
     1778        //Validate $langcode
     1779        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
     1780            $langcode = 'en';
    16271781        }
    16281782        $foundlang = true;
     
    19192073        }
    19202074
    1921         if ($this->MessageID != '') {
     2075        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
     2076        // https://tools.ietf.org/html/rfc5322#section-3.6.4
     2077        if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
    19222078            $this->lastMessageID = $this->MessageID;
    19232079        } else {
     
    20212177    public function getSentMIMEMessage()
    20222178    {
    2023         return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
     2179        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
     2180    }
     2181
     2182    /**
     2183     * Create unique ID
     2184     * @return string
     2185     */
     2186    protected function generateId() {
     2187        return md5(uniqid(time()));
    20242188    }
    20252189
     
    20352199        $body = '';
    20362200        //Create unique IDs and preset boundaries
    2037         $this->uniqueid = md5(uniqid(time()));
     2201        $this->uniqueid = $this->generateId();
    20382202        $this->boundary[1] = 'b1_' . $this->uniqueid;
    20392203        $this->boundary[2] = 'b2_' . $this->uniqueid;
     
    20512215        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
    20522216            $bodyEncoding = '7bit';
     2217            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
    20532218            $bodyCharSet = 'us-ascii';
    20542219        }
    2055         //If lines are too long, change to quoted-printable transfer encoding
    2056         if (self::hasLineLongerThanMax($this->Body)) {
    2057             $this->Encoding = 'quoted-printable';
     2220        //If lines are too long, and we're not already using an encoding that will shorten them,
     2221        //change to quoted-printable transfer encoding for the body part only
     2222        if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) {
    20582223            $bodyEncoding = 'quoted-printable';
    20592224        }
     
    20642229        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
    20652230            $altBodyEncoding = '7bit';
     2231            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
    20662232            $altBodyCharSet = 'us-ascii';
    20672233        }
    2068         //If lines are too long, change to quoted-printable transfer encoding
    2069         if (self::hasLineLongerThanMax($this->AltBody)) {
     2234        //If lines are too long, and we're not already using an encoding that will shorten them,
     2235        //change to quoted-printable transfer encoding for the alt body part only
     2236        if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) {
    20702237            $altBodyEncoding = 'quoted-printable';
    20712238        }
     
    21702337                break;
    21712338            default:
    2172                 // catch case 'plain' and case ''
    2173                 $body .= $this->encodeString($this->Body, $bodyEncoding);
     2339                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
     2340                //Reset the `Encoding` property in case we changed it for line length reasons
     2341                $this->Encoding = $bodyEncoding;
     2342                $body .= $this->encodeString($this->Body, $this->Encoding);
    21742343                break;
    21752344        }
     
    22772446    /**
    22782447     * Set the message type.
    2279      * PHPMailer only supports some preset message types,
    2280      * not arbitrary MIME structures.
     2448     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
    22812449     * @access protected
    22822450     * @return void
     
    22962464        $this->message_type = implode('_', $type);
    22972465        if ($this->message_type == '') {
     2466            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
    22982467            $this->message_type = 'plain';
    22992468        }
     
    32103379
    32113380    /**
    3212      * Create a message from an HTML string.
    3213      * Automatically makes modifications for inline images and backgrounds
    3214      * and creates a plain-text version by converting the HTML.
    3215      * Overwrites any existing values in $this->Body and $this->AltBody
     3381     * Create a message body from an HTML string.
     3382     * Automatically inlines images and creates a plain-text version by converting the HTML,
     3383     * overwriting any existing values in Body and AltBody.
     3384     * $basedir is used when handling relative image paths, e.g. <img src="images/a.png">
     3385     * will look for an image file in $basedir/images/a.png and convert it to inline.
     3386     * If you don't want to apply these transformations to your HTML, just set Body and AltBody yourself.
    32163387     * @access public
    32173388     * @param string $message HTML message string
    3218      * @param string $basedir baseline directory for path
     3389     * @param string $basedir base directory for relative paths to images
    32193390     * @param boolean|callable $advanced Whether to use the internal HTML to text converter
    32203391     *    or your own custom converter @see PHPMailer::html2text()
    3221      * @return string $message
     3392     * @return string $message The transformed message Body
    32223393     */
    32233394    public function msgHTML($message, $basedir = '', $advanced = false)
     
    32423413                        );
    32433414                    }
    3244                 } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[A-z]+://#', $url)) {
     3415                } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[a-z][a-z0-9+.-]*://#i', $url)) {
    32453416                    // Do not change urls for absolute images (thanks to corvuscorax)
    32463417                    // Do not change urls that are already inline images
     
    32783449        $this->Body = $this->normalizeBreaks($message);
    32793450        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
    3280         if (empty($this->AltBody)) {
     3451        if (!$this->alternativeExists()) {
    32813452            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
    32823453                self::CRLF . self::CRLF;
     
    32893460     * This is used by msgHTML().
    32903461     * Note - older versions of this function used a bundled advanced converter
    3291      * which was been removed for license reasons in #232
     3462     * which was been removed for license reasons in #232.
    32923463     * Example usage:
    32933464     * <code>
     
    35893760     * @param string $signHeader
    35903761     * @throws phpmailerException
    3591      * @return string
     3762     * @return string The DKIM signature value
    35923763     */
    35933764    public function DKIM_Sign($signHeader)
     
    35993770            return '';
    36003771        }
    3601         $privKeyStr = file_get_contents($this->DKIM_private);
    3602         if ($this->DKIM_passphrase != '') {
     3772        $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
     3773        if ('' != $this->DKIM_passphrase) {
    36033774            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
    36043775        } else {
    3605             $privKey = $privKeyStr;
    3606         }
    3607         if (openssl_sign($signHeader, $signature, $privKey)) {
    3608             return base64_encode($signature);
    3609         }
     3776            $privKey = openssl_pkey_get_private($privKeyStr);
     3777        }
     3778        //Workaround for missing digest algorithms in old PHP & OpenSSL versions
     3779        //@link http://stackoverflow.com/a/11117338/333340
     3780        if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
     3781            in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
     3782            if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
     3783                openssl_pkey_free($privKey);
     3784                return base64_encode($signature);
     3785            }
     3786        } else {
     3787            $pinfo = openssl_pkey_get_details($privKey);
     3788            $hash = hash('sha256', $signHeader);
     3789            //'Magic' constant for SHA256 from RFC3447
     3790            //@link https://tools.ietf.org/html/rfc3447#page-43
     3791            $t = '3031300d060960864801650304020105000420' . $hash;
     3792            $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
     3793            $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
     3794
     3795            if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
     3796                openssl_pkey_free($privKey);
     3797                return base64_encode($signature);
     3798            }
     3799        }
     3800        openssl_pkey_free($privKey);
    36103801        return '';
    36113802    }
     
    36243815            list($heading, $value) = explode(':', $line, 2);
    36253816            $heading = strtolower($heading);
    3626             $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces
     3817            $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
    36273818            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
    36283819        }
     
    36623853    public function DKIM_Add($headers_line, $subject, $body)
    36633854    {
    3664         $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
     3855        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
    36653856        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
    36663857        $DKIMquery = 'dns/txt'; // Query method
     
    36703861        $from_header = '';
    36713862        $to_header = '';
     3863        $date_header = '';
    36723864        $current = '';
    36733865        foreach ($headers as $header) {
     
    36783870                $to_header = $header;
    36793871                $current = 'to_header';
     3872            } elseif (strpos($header, 'Date:') === 0) {
     3873                $date_header = $header;
     3874                $current = 'date_header';
    36803875            } else {
    36813876                if (!empty($$current) && strpos($header, ' =?') === 0) {
     
    36883883        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
    36893884        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
     3885        $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
    36903886        $subject = str_replace(
    36913887            '|',
     
    36953891        $body = $this->DKIM_BodyC($body);
    36963892        $DKIMlen = strlen($body); // Length of body
    3697         $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body
     3893        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
    36983894        if ('' == $this->DKIM_identity) {
    36993895            $ident = '';
     
    37083904            ";\r\n" .
    37093905            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
    3710             "\th=From:To:Subject;\r\n" .
     3906            "\th=From:To:Date:Subject;\r\n" .
    37113907            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
    37123908            "\tz=$from\r\n" .
    37133909            "\t|$to\r\n" .
     3910            "\t|$date\r\n" .
    37143911            "\t|$subject;\r\n" .
    37153912            "\tbh=" . $DKIMb64 . ";\r\n" .
     
    37183915            $from_header . "\r\n" .
    37193916            $to_header . "\r\n" .
     3917            $date_header . "\r\n" .
    37203918            $subject_header . "\r\n" .
    37213919            $dkimhdrs
  • branches/4.7/src/wp-includes/class-smtp.php

    r36083 r39646  
    3131     * @var string
    3232     */
    33     const VERSION = '5.2.14';
     33    const VERSION = '5.2.21';
    3434
    3535    /**
     
    8282     * @see SMTP::VERSION
    8383     */
    84     public $Version = '5.2.14';
     84    public $Version = '5.2.21';
    8585
    8686    /**
     
    151151    public $Timelimit = 300;
    152152
     153    /**
     154     * @var array patterns to extract smtp transaction id from smtp reply
     155     * Only first capture group will be use, use non-capturing group to deal with it
     156     * Extend this class to override this property to fulfil your needs.
     157     */
     158    protected $smtp_transaction_id_patterns = array(
     159        'exim' => '/[0-9]{3} OK id=(.*)/',
     160        'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
     161        'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
     162    );
     163
    153164    /**
    154165     * The socket for the server connection.
     
    207218        //Avoid clash with built-in function names
    208219        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
    209             call_user_func($this->Debugoutput, $str, $this->do_debug);
     220            call_user_func($this->Debugoutput, $str, $level);
    210221            return;
    211222        }
     
    273284        if ($streamok) {
    274285            $socket_context = stream_context_create($options);
    275             //Suppress errors; connection failures are handled at a higher level
    276             $this->smtp_conn = @stream_socket_client(
     286            set_error_handler(array($this, 'errorHandler'));
     287            $this->smtp_conn = stream_socket_client(
    277288                $host . ":" . $port,
    278289                $errno,
     
    282293                $socket_context
    283294            );
     295            restore_error_handler();
    284296        } else {
    285297            //Fall back to fsockopen which should work in more places, but is missing some features
     
    288300                self::DEBUG_CONNECTION
    289301            );
     302            set_error_handler(array($this, 'errorHandler'));
    290303            $this->smtp_conn = fsockopen(
    291304                $host,
     
    295308                $timeout
    296309            );
     310            restore_error_handler();
    297311        }
    298312        // Verify we connected properly
     
    337351            return false;
    338352        }
     353
     354        //Allow the best TLS version(s) we can
     355        $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
     356
     357        //PHP 5.6.7 dropped inclusion of TLS 1.1 and 1.2 in STREAM_CRYPTO_METHOD_TLS_CLIENT
     358        //so add them back in manually if we can
     359        if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
     360            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
     361            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
     362        }
     363
    339364        // Begin encrypted connection
    340365        if (!stream_socket_enable_crypto(
    341366            $this->smtp_conn,
    342367            true,
    343             STREAM_CRYPTO_METHOD_TLS_CLIENT
     368            $crypto_method
    344369        )) {
    345370            return false;
     
    354379     * @param string $username The user name
    355380     * @param string $password The password
    356      * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
     381     * @param string $authtype The auth type (PLAIN, LOGIN, CRAM-MD5)
    357382     * @param string $realm The auth realm for NTLM
    358383     * @param string $workstation The auth workstation for NTLM
     
    390415
    391416            if (empty($authtype)) {
    392                 foreach (array('LOGIN', 'CRAM-MD5', 'PLAIN') as $method) {
     417                foreach (array('CRAM-MD5', 'LOGIN', 'PLAIN') as $method) {
    393418                    if (in_array($method, $this->server_caps['AUTH'])) {
    394419                        $authtype = $method;
     
    674699    {
    675700        $this->server_caps = array();
    676         $lines = explode("\n", $this->last_reply);
     701        $lines = explode("\n", $this->helo_rply);
    677702
    678703        foreach ($lines as $n => $s) {
     
    11161141        return $this->Timeout;
    11171142    }
     1143
     1144    /**
     1145     * Reports an error number and string.
     1146     * @param integer $errno The error number returned by PHP.
     1147     * @param string $errmsg The error message returned by PHP.
     1148     */
     1149    protected function errorHandler($errno, $errmsg)
     1150    {
     1151        $notice = 'Connection: Failed to connect to server.';
     1152        $this->setError(
     1153            $notice,
     1154            $errno,
     1155            $errmsg
     1156        );
     1157        $this->edebug(
     1158            $notice . ' Error number ' . $errno . '. "Error notice: ' . $errmsg,
     1159            self::DEBUG_CONNECTION
     1160        );
     1161    }
     1162
     1163    /**
     1164     * Will return the ID of the last smtp transaction based on a list of patterns provided
     1165     * in SMTP::$smtp_transaction_id_patterns.
     1166     * If no reply has been received yet, it will return null.
     1167     * If no pattern has been matched, it will return false.
     1168     * @return bool|null|string
     1169     */
     1170    public function getLastTransactionID()
     1171    {
     1172        $reply = $this->getLastReply();
     1173
     1174        if (empty($reply)) {
     1175            return null;
     1176        }
     1177
     1178        foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
     1179            if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
     1180                return $matches[1];
     1181            }
     1182        }
     1183
     1184        return false;
     1185    }
    11181186}
Note: See TracChangeset for help on using the changeset viewer.