Fixed max value check, improved request value fetching

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

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 87f7c983e1acb4498d08834e9c5f7a02ec2860c9..16f635e3a04b402e1ac8255f8ced3a2a72589db5 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,8 @@
 
 namespace Friendica\Util;
 
+use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\DI;
 
 /**
@@ -28,20 +30,23 @@ use Friendica\DI;
  */
 class Proxy
 {
-
        /**
-        * Default time to keep images in proxy storage
+        * Sizes constants
         */
-       const DEFAULT_TIME = 86400; // 1 Day
+       const SIZE_MICRO  = 'micro'; // 48
+       const SIZE_THUMB  = 'thumb'; // 80
+       const SIZE_SMALL  = 'small'; // 300
+       const SIZE_MEDIUM = 'medium'; // 600
+       const SIZE_LARGE  = 'large'; // 1024
 
        /**
-        * Sizes constants
+        * Pixel Sizes
         */
-       const SIZE_MICRO  = 'micro';
-       const SIZE_THUMB  = 'thumb';
-       const SIZE_SMALL  = 'small';
-       const SIZE_MEDIUM = 'medium';
-       const SIZE_LARGE  = 'large';
+       const PIXEL_MICRO  = 48;
+       const PIXEL_THUMB  = 80;
+       const PIXEL_SMALL  = 300;
+       const PIXEL_MEDIUM = 600;
+       const PIXEL_LARGE  = 1024;
 
        /**
         * Accepted extensions
@@ -67,55 +72,34 @@ 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 bool   $writemode Returns a local path the remote URL should be saved to
-        * @param string $size      One of the ProxyUtils::SIZE_* constants
+        * @param string $size      One of the Proxy::SIZE_* constants
         *
         * @return string The proxyfied URL or relative path
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function proxifyUrl($url, $writemode = false, $size = '')
+       public static function proxifyUrl($url, $size = '')
        {
-               // Get application instance
-               $a = DI::app();
-
-               // Trim URL first
-               $url = trim($url);
-
-               // Is no http in front of it?
-               /// @TODO To weak test for being a valid URL
-               if (substr($url, 0, 4) !== 'http') {
+               if (!DI::config()->get('system', 'proxify_content')) {
                        return $url;
                }
 
-               // Only continue if it isn't a local image and the isn't deactivated
-               if (self::isLocalImage($url)) {
-                       $url = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $url);
-                       return $url;
-               }
+               // Trim URL first
+               $url = trim($url);
 
-               // Is the proxy disabled?
-               if (DI::config()->get('system', 'proxy_disabled')) {
+               // Quit if not an HTTP/HTTPS link or if local
+               if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https']) || self::isLocalImage($url)) {
                        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');
 
-               // Creating a sub directory to reduce the amount of files in the cache directory
-               $basepath = $a->getBasePath() . '/proxy';
-
                $shortpath = hash('md5', $url);
                $longpath = substr($shortpath, 0, 2);
 
-               if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) {
-                       mkdir($basepath . '/' . $longpath);
-                       chmod($basepath . '/' . $longpath, 0777);
-               }
-
                $longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
 
                // Extract the URL extension
@@ -132,14 +116,11 @@ class Proxy
                        $size = ':' . $size;
                }
 
+               Logger::info('Created proxy link', ['url' => $url, 'callstack' => System::callstack(20)]);
+
                // Too long files aren't supported by Apache
-               // Writemode in combination with long files shouldn't be possible
-               if ((strlen($proxypath) > 250) && $writemode) {
-                       return $shortpath;
-               } elseif (strlen($proxypath) > 250) {
+               if (strlen($proxypath) > 250) {
                        return DI::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
-               } elseif ($writemode) {
-                       return $longpath;
                } else {
                        return $proxypath . $size;
                }
@@ -180,11 +161,7 @@ class Proxy
                        return true;
                }
 
-               // links normalised - bug #431
-               $baseurl = Strings::normaliseLink(DI::baseUrl());
-               $url = Strings::normaliseLink($url);
-
-               return (substr($url, 0, strlen($baseurl)) == $baseurl);
+               return Network::isLocalLink($url);
        }
 
        /**