X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=aa0f66bbffbc274fae80eef7e9ebb6564c14e54f;hb=911ed3d6ba98149ed6d400d554e7a0e10bd1c273;hp=16e3e221ff5c0da7dab239eb27e089b3aa80bb05;hpb=844727dc19e584b807cd1831a8268544f7230965;p=friendica.git

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 16e3e221ff..aa0f66bbff 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,19 +21,16 @@
 
 namespace Friendica\Util;
 
+use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\DI;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * Proxy utilities class
  */
 class Proxy
 {
-
-	/**
-	 * Default time to keep images in proxy storage
-	 */
-	const DEFAULT_TIME = 86400; // 1 Day
-
 	/**
 	 * Sizes constants
 	 */
@@ -76,17 +73,19 @@ class Proxy
 	 * Transform a remote URL into a local one.
 	 *
 	 * This function only performs the URL replacement on http URL and if the
-	 * provided URL isn't local, "the isn't deactivated" (sic) and if the config
-	 * system.proxy_disabled is set to false.
+	 * provided URL isn't local
 	 *
-	 * @param string $url       The URL to proxyfy
-	 * @param string $size      One of the ProxyUtils::SIZE_* constants
-	 *
-	 * @return string The proxyfied URL or relative path
+	 * @param string $url       The URL to proxify
+	 * @param string $size      One of the Proxy::SIZE_* constants
+	 * @return string The proxified URL or relative path
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function proxifyUrl($url, $size = '')
+	public static function proxifyUrl(string $url, string $size = ''): string
 	{
+		if (!DI::config()->get('system', 'proxify_content')) {
+			return $url;
+		}
+
 		// Trim URL first
 		$url = trim($url);
 
@@ -95,11 +94,6 @@ class Proxy
 			return $url;
 		}
 
-		// Is the proxy disabled?
-		if (DI::config()->get('system', 'proxy_disabled')) {
-			return $url;
-		}
-
 		// Image URL may have encoded ampersands for display which aren't desirable for proxy
 		$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
 
@@ -122,6 +116,8 @@ class Proxy
 			$size = ':' . $size;
 		}
 
+		Logger::info('Created proxy link', ['url' => $url, 'callstack' => System::callstack(20)]);
+
 		// Too long files aren't supported by Apache
 		if (strlen($proxypath) > 250) {
 			return DI::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
@@ -141,21 +137,22 @@ 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
 	 */
-	public static function isLocalImage($url)
+	public static function isLocalImage(string $url): bool
 	{
 		if (substr($url, 0, 1) == '/') {
 			return true;
@@ -172,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($url)
+	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]);