Check redirect URL safeness in Toolbox::callCurl()

glpi-project · Nov 3, 2022 · 8bd8449 · 8bd8449
1 parent 7cbb2d5
commit 8bd8449
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 31 deletions.
diff --git a/src/RSSFeed.php b/src/RSSFeed.php
@@ -916,55 +916,62 @@ public function showDiscoveredFeeds()
 
 
     /**
-     * Get a specific RSS feed
+     * Get a specific RSS feed.
      *
-     * @param $url             string/array   URL of the feed or array of URL
-     * @param $cache_duration  timestamp      cache duration (default DAY_TIMESTAMP)
+     * @param string    $url            URL of the feed or array of URL
+     * @param int       $cache_duration Cache duration, in seconds
      *
-     * @return feed object
+     * @return SimplePie|false
      **/
     public static function getRSSFeed($url, $cache_duration = DAY_TIMESTAMP)
     {
-        global $CFG_GLPI;
-
-        if (!Toolbox::isUrlSafe($url)) {
-            return false;
-        }
+        global $GLPI_CACHE;
 
         if (Sanitizer::isHtmlEncoded($url)) {
             $url = Sanitizer::decodeHtmlSpecialChars($url);
         }
-        $feed = new SimplePie();
-        $feed->set_cache_location(GLPI_RSS_DIR);
-        $feed->set_cache_duration($cache_duration);
-
-       // proxy support
-        if (!empty($CFG_GLPI["proxy_name"])) {
-            $prx_opt = [];
-            $prx_opt[CURLOPT_PROXY]     = $CFG_GLPI["proxy_name"];
-            $prx_opt[CURLOPT_PROXYPORT] = $CFG_GLPI["proxy_port"];
-            if (!empty($CFG_GLPI["proxy_user"])) {
-                $prx_opt[CURLOPT_HTTPAUTH]     = CURLAUTH_ANYSAFE;
-                $prx_opt[CURLOPT_PROXYUSERPWD] = $CFG_GLPI["proxy_user"] . ":" .
-                                             (new GLPIKey())->decrypt($CFG_GLPI["proxy_passwd"]);
+
+        // Fetch feed data, unless it is already cached
+        $cache_key = sha1($url);
+        $update_cache = false;
+        if (($raw_data = $GLPI_CACHE->get($cache_key)) === null) {
+            if (!Toolbox::isUrlSafe($url)) {
+                return false;
+            }
+
+            $error_msg  = null;
+            $curl_error = null;
+            $raw_data = Toolbox::callCurl($url, [], $error_msg, $curl_error, true);
+            if (empty($raw_data)) {
+                return false;
             }
-            $feed->set_curl_options($prx_opt);
+
+            $doc = new DOMDocument();
+            if (!@$doc->loadXML($raw_data)) {
+                // Prevent exception on invalid XML (see https://github.com/simplepie/simplepie/pull/747)
+                return false;
+            }
+
+            $update_cache = true;
         }
 
-        $feed->enable_cache(true);
-        $feed->set_feed_url($url);
+        $feed = new SimplePie();
+        $feed->enable_cache(false);
+        $feed->set_raw_data($raw_data);
         $feed->force_feed(true);
-       // Initialize the whole SimplePie object.  Read the feed, process it, parse it, cache it, and
-       // all that other good stuff.  The feed's information will not be available to SimplePie before
-       // this is called.
+        // Initialize the whole SimplePie object. Read the feed, process it, parse it, cache it, and
+        // all that other good stuff. The feed's information will not be available to SimplePie before
+        // this is called.
         $feed->init();
 
-       // We'll make sure that the right content type and character encoding gets set automatically.
-       // This function will grab the proper character encoding, as well as set the content type to text/html.
-        $feed->handle_content_type();
         if ($feed->error()) {
             return false;
         }
+
+        if ($update_cache) {
+            $GLPI_CACHE->set($cache_key, $raw_data, $cache_duration);
+        }
+
         return $feed;
     }
 

diff --git a/src/Toolbox.php b/src/Toolbox.php
@@ -1461,6 +1461,10 @@ public static function callCurl(
             CURLOPT_CONNECTTIMEOUT  => 5,
         ] + $eopts;
 
+        if ($check_url_safeness) {
+            $opts[CURLOPT_FOLLOWLOCATION] = false;
+        }
+
         if (!empty($CFG_GLPI["proxy_name"])) {
            // Connection using proxy
             $opts += [
@@ -1486,6 +1490,7 @@ public static function callCurl(
         curl_setopt_array($ch, $opts);
         $content = curl_exec($ch);
         $curl_error = curl_error($ch) ?: null;
+        $curl_redirect = curl_getinfo($ch, CURLINFO_REDIRECT_URL) ?: null;
         curl_close($ch);
 
         if ($curl_error !== null) {
@@ -1503,6 +1508,8 @@ public static function callCurl(
                 );
             }
             $content = '';
+        } else if ($curl_redirect !== null) {
+            return self::callCurl($curl_redirect, $eopts, $msgerr, $curl_error, $check_url_safeness);
         } else if (empty($content)) {
             $msgerr = __('No data available on the web site');
         }