X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=fc7d369ad528d1b4d89f9e9c76aeb6d5c034dfb6;hb=fe442683efb8b75394d7df041716c47c81b05fbc;hp=e104073f0331e6f22cd9dfcdce9b829e39bb309a;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php index e104073f03..fc7d369ad5 100644 --- a/src/Util/Proxy.php +++ b/src/Util/Proxy.php @@ -1,6 +1,6 @@ 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 +115,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; } @@ -156,7 +136,7 @@ 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); @@ -167,10 +147,11 @@ class Proxy * Checks if the URL is a local URL. * * @param string $url + * * @return boolean * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function isLocalImage($url) + public static function isLocalImage(string $url): bool { if (substr($url, 0, 1) == '/') { return true; @@ -180,20 +161,17 @@ 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); } /** * 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); @@ -207,10 +185,11 @@ class Proxy * 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]);