X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FProxy.php;h=4d1e1c304b082e912ef54abe6d70756e5b96ceb6;hb=7fd1db0ec6b3c729e347f94ca961421fb4f5070e;hp=abe9a8c2e9f4ba77d1f5217a8af394d04def3777;hpb=b67c10812ab962d1ec05cd8c9e256c503d64ca60;p=friendica.git

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index abe9a8c2e9..4d1e1c304b 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/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
  *
@@ -25,6 +25,8 @@ use Friendica\BaseModule;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPException\NotModifiedException;
 use Friendica\Object\Image;
 use Friendica\Util\HTTPSignature;
@@ -44,7 +46,7 @@ class Proxy extends BaseModule
 	/**
 	 * Fetch remote image content
 	 */
-	public function rawContent()
+	protected function rawContent(array $request = [])
 	{
 		$request = $this->getRequestInfo();
 
@@ -53,17 +55,17 @@ class Proxy extends BaseModule
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-			if (!empty($_SERVER["HTTP_IF_NONE_MATCH"])) {
-				header("Etag: " . $_SERVER["HTTP_IF_NONE_MATCH"]);
+		if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+			if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+				header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
 			}
-			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
-			header("Cache-Control: max-age=31536000");
-			if (function_exists("header_remove")) {
-				header_remove("Last-Modified");
-				header_remove("Expires");
-				header_remove("Cache-Control");
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
+			header('Cache-Control: max-age=31536000');
+			if (function_exists('header_remove')) {
+				header_remove('Last-Modified');
+				header_remove('Expires');
+				header_remove('Cache-Control');
 			}
 			throw new NotModifiedException();
 		}
@@ -72,8 +74,8 @@ class Proxy extends BaseModule
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		if (!local_user()) {
-			Logger::info('Redirecting not logged in user to original address', ['url' => $request['url']]);
+		if (!DI::userSession()->getLocalUserId()) {
+			Logger::debug('Redirecting not logged in user to original address', ['url' => $request['url']]);
 			System::externalRedirect($request['url']);
 		}
 
@@ -81,20 +83,27 @@ class Proxy extends BaseModule
 		$request['url'] = str_replace(' ', '+', $request['url']);
 
 		// Fetch the content with the local user
-		$fetchResult = HTTPSignature::fetchRaw($request['url'], local_user(), ['accept_content' => [], 'timeout' => 10]);
-		$img_str = $fetchResult->getBody();
-
-		if (!$fetchResult->isSuccess() || empty($img_str)) {
-			Logger::info('Error fetching image', ['image' => $request['url'], 'return' => $fetchResult->getReturnCode(), 'empty' => empty($img_str)]);
+		try {
+			$fetchResult = HTTPSignature::fetchRaw($request['url'], DI::userSession()->getLocalUserId(), [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::IMAGE], 'timeout' => 10]);
+			$img_str = $fetchResult->getBody();
+
+			if (!$fetchResult->isSuccess() || empty($img_str)) {
+				Logger::notice('Error fetching image', ['image' => $request['url'], 'return' => $fetchResult->getReturnCode(), 'empty' => empty($img_str)]);
+				self::responseError();
+				// stop.
+			}
+		} catch (\Exception $exception) {
+			Logger::notice('Error fetching image', ['image' => $request['url'], 'exception' => $exception]);
 			self::responseError();
-			// stop.
 		}
 
+		Logger::debug('Got picture', ['Content-Type' => $fetchResult->getHeader('Content-Type'), 'uid' => DI::userSession()->getLocalUserId(), 'image' => $request['url']]);
+
 		$mime = Images::getMimeTypeByData($img_str);
 
 		$image = new Image($img_str, $mime);
 		if (!$image->isValid()) {
-			Logger::info('The image is invalid', ['image' => $request['url'], 'mime' => $mime]);
+			Logger::notice('The image is invalid', ['image' => $request['url'], 'mime' => $mime]);
 			self::responseError();
 			// stop.
 		}
@@ -119,7 +128,7 @@ class Proxy extends BaseModule
 	 *    ]
 	 * @throws \Exception
 	 */
-	private function getRequestInfo()
+	private function getRequestInfo(): array
 	{
 		$size = ProxyUtils::PIXEL_LARGE;
 		$sizetype = '';
@@ -183,12 +192,13 @@ class Proxy extends BaseModule
 	 * Output the image with cache headers
 	 *
 	 * @param Image $img
+	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function responseImageHttpCache(Image $img)
 	{
 		if (is_null($img) || !$img->isValid()) {
-			Logger::info('The cached image is invalid');
+			Logger::notice('The cached image is invalid');
 			self::responseError();
 			// stop.
 		}
@@ -198,6 +208,6 @@ class Proxy extends BaseModule
 		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
 		header('Cache-Control: max-age=31536000');
 		echo $img->asString();
-		exit();
+		System::exit();
 	}
 }