Preparations for a moderator role

[friendica.git] / src / Util / Proxy.php

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 02c9d2a1843a2b651021054367f6ce13ce792491..aa0f66bbffbc274fae80eef7e9ebb6564c14e54f 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,7 @@ namespace Friendica\Util;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * Proxy utilities class
@@ -74,13 +75,12 @@ class Proxy
         * This function only performs the URL replacement on http URL and if the
         * provided URL isn't local
         *
-        * @param string $url       The URL to proxyfy
+        * @param string $url       The URL to proxify
         * @param string $size      One of the Proxy::SIZE_* constants
-        *
-        * @return string The proxyfied URL or relative path
+        * @return string The proxified URL or relative path
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function proxifyUrl(string $url, $size = '')
+       public static function proxifyUrl(string $url, string $size = ''): string
        {
                if (!DI::config()->get('system', 'proxify_content')) {
                        return $url;
@@ -137,17 +137,18 @@ class Proxy
         * @return string Proxified HTML code
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function proxifyHtml($html)
+       public static function proxifyHtml(string $html): string
        {
                $html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
 
-               return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html);
+               return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', [self::class, 'replaceUrl'], $html);
        }
 
        /**
         * Checks if the URL is a local URL.
         *
         * @param string $url
+        *
         * @return boolean
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
@@ -168,26 +169,31 @@ class Proxy
         * Return the array of query string parameters from a URL
         *
         * @param string $url URL to parse
+        *
         * @return array Associative array of query string parameters
         */
        private static function parseQuery(string $url): array
        {
-               $query = parse_url($url, PHP_URL_QUERY);
-               $query = html_entity_decode($query);
+               try {
+                       $uri = new Uri($url);
 
-               parse_str($query, $arr);
+                       parse_str($uri->getQuery(), $arr);
 
-               return $arr;
+                       return $arr;
+               } catch (\Throwable $e) {
+                       return [];
+               }
        }
 
        /**
         * Call-back method to replace the UR
         *
         * @param array $matches Matches from preg_replace_callback()
+        *
         * @return string Proxified HTML image tag
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function replaceUrl(array $matches)
+       private static function replaceUrl(array $matches): string
        {
                // if the picture seems to be from another picture cache then take the original source
                $queryvar = self::parseQuery($matches[2]);