Changeset 52393 for trunk/src/wp-includes/SimplePie/Sanitize.php

Timestamp:

12/20/2021 07:31:37 PM (3 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update the SimplePie library to version 1.5.7.

This version shows significant improvements in the compatibility of SimplePie with PHP 8.0, 8.1, and even contains an initial PHP 8.2 fix. The release also contains a number of other bug fixes.

Release notes: ​https://github.com/simplepie/simplepie/releases/tag/1.5.7

For a full list of changes in this update, see the SimplePie GitHub:
​https://github.com/simplepie/simplepie/compare/1.5.6...1.5.7

Follow-up to [47733], [49176].

Props jrf, SergeyBiryukov.
Fixes #54659.

File:

• trunk/src/wp-includes/SimplePie/Sanitize.php (modified) (3 diffs)

trunk/src/wp-includes/SimplePie/Sanitize.php

@@ -72 +72 @@
     var $force_fsockopen = false;
     var $replace_url_attributes = null;
+    var $registry;
+
+    /**
+     * List of domains for which to force HTTPS.
+     * @see SimplePie_Sanitize::set_https_domains()
+     * Array is a tree split at DNS levels. Example:
+     * array('biz' => true, 'com' => array('example' => true), 'net' => array('example' => array('www' => true)))
+     */
+    var $https_domains = array();
 
     public function __construct()
@@ -242 +251 @@
     }
 
+    /**
+     * Set the list of domains for which to force HTTPS.
+     * @see SimplePie_Misc::https_url()
+     * Example array('biz', 'example.com', 'example.org', 'www.example.net');
+     */
+    public function set_https_domains($domains)
+    {
+        $this->https_domains = array();
+        foreach ($domains as $domain)
+        {
+            $domain = trim($domain, ". \t\n\r\0\x0B");
+            $segments = array_reverse(explode('.', $domain));
+            $node =& $this->https_domains;
+            foreach ($segments as $segment)
+            {//Build a tree
+                if ($node === true)
+                {
+                    break;
+                }
+                if (!isset($node[$segment]))
+                {
+                    $node[$segment] = array();
+                }
+                $node =& $node[$segment];
+            }
+            $node = true;
+        }
+    }
+
+    /**
+     * Check if the domain is in the list of forced HTTPS.
+     */
+    protected function is_https_domain($domain)
+    {
+        $domain = trim($domain, '. ');
+        $segments = array_reverse(explode('.', $domain));
+        $node =& $this->https_domains;
+        foreach ($segments as $segment)
+        {//Explore the tree
+            if (isset($node[$segment]))
+            {
+                $node =& $node[$segment];
+            }
+            else
+            {
+                break;
+            }
+        }
+        return $node === true;
+    }
+
+    /**
+     * Force HTTPS for selected Web sites.
+     */
+    public function https_url($url)
+    {
+        return (strtolower(substr($url, 0, 7)) === 'http://') &&
+            $this->is_https_domain(parse_url($url, PHP_URL_HOST)) ?
+            substr_replace($url, 's', 4, 0) :   //Add the 's' to HTTPS
+            $url;
+    }
+
     public function sanitize($data, $type, $base = '')
     {
@@ -444 +515 @@
                         if ($value !== false)
                         {
+                            $value = $this->https_url($value);
                             $element->setAttribute($attribute, $value);
                         }