X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=7f3c94672273dacb5341e6d98d6ef4080fd73c4e;hb=a8402109b183e81dad4e5443883dd292df094b86;hp=8478ce868af103794aad2ba1c534fc929dff3a57;hpb=9c9ebfc7c97016881d9ad2bb3c3b54a5640d2f08;p=friendica.git
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 8478ce868a..7f3c946722 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,31 +1,53 @@
.
+ *
+ */
namespace Friendica\Util;
-use Friendica\BaseModule;
-use Friendica\BaseObject;
-use Friendica\Core\Config;
+use Friendica\Core\Logger;
use Friendica\Core\System;
+use Friendica\DI;
+use GuzzleHttp\Psr7\Uri;
/**
- * @brief Proxy utilities class
+ * Proxy utilities class
*/
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
@@ -41,64 +63,43 @@ class Proxy
];
/**
- * @brief Private constructor
+ * Private constructor
*/
private function __construct () {
// No instances from utilities classes
}
/**
- * @brief Transform a remote URL into a local one.
+ * 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(string $url, string $size = ''): string
{
- // Get application instance
- $a = BaseObject::getApp();
-
- // 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(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $url);
- return $url;
- }
+ // Trim URL first
+ $url = trim($url);
- // Is the proxy disabled?
- if (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
@@ -109,27 +110,24 @@ class Proxy
$longpath .= '.' . $extension;
}
- $proxypath = System::baseUrl() . '/proxy/' . $longpath;
+ $proxypath = DI::baseUrl() . '/proxy/' . $longpath;
if ($size != '') {
$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) {
- return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
- } elseif ($writemode) {
- return $longpath;
+ if (strlen($proxypath) > 250) {
+ return DI::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
} else {
return $proxypath . $size;
}
}
/**
- * @brief "Proxifies" HTML code's image tags
+ * "Proxifies" HTML code's image tags
*
* "Proxifies", means replaces image URLs in given HTML code with those from
* proxy storage directory.
@@ -137,21 +135,24 @@ class Proxy
* @param string $html Un-proxified HTML code
*
* @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(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $html);
+ $html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
- return preg_replace_callback('/(![]()
]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html);
+ return preg_replace_callback('/(![]()
]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', [self::class, 'replaceUrl'], $html);
}
/**
- * @brief Checks if the URL is a local URL.
+ * 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;
@@ -161,36 +162,38 @@ class Proxy
return true;
}
- // links normalised - bug #431
- $baseurl = normalise_link(System::baseUrl());
- $url = normalise_link($url);
-
- return (substr($url, 0, strlen($baseurl)) == $baseurl);
+ return Network::isLocalLink($url);
}
/**
- * @brief Return the array of query string parameters from a 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);
+ try {
+ $uri = new Uri($url);
- parse_str($query, $arr);
+ parse_str($uri->getQuery(), $arr);
- return $arr;
+ return $arr;
+ } catch (\Throwable $e) {
+ return [];
+ }
}
/**
- * @brief Call-back method to replace the UR
+ * 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]);