HTTPRequest: Replace getInfo() with new parameter 'content_length'

src/Network/CurlResult.php

@@ -319,12 +319,6 @@ class CurlResult implements IHTTPResult
 		return $this->body;
 	}
 
-	/** {@inheritDoc} */
-	public function getInfo()
-	{
-		return $this->info;
-	}
-
 	/** {@inheritDoc} */
 	public function isRedirectUrl()
 	{

src/Network/GuzzleResponse.php

@@ -121,11 +121,6 @@ class GuzzleResponse extends Response implements IHTTPResult, ResponseInterface
 		return $this->url;
 	}
 
-	public function getInfo()
-	{
-		// TODO: Implement getInfo() method.
-	}
-
 	/** {@inheritDoc} */
 	public function isRedirectUrl()
 	{

src/Network/HTTPRequest.php

@@ -30,6 +30,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\TransferException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
@@ -204,6 +205,13 @@ class HTTPRequest implements IHTTPRequest
 			$this->logger->notice('Curl redirect.', ['url' => $request->getUri(), 'to' => $uri]);
 		};
 
+		$onHeaders = function (ResponseInterface $response) use ($opts) {
+			if (!empty($opts['content_length']) &&
+				$response->getHeaderLine('Content-Length') > $opts['content_length']) {
+				throw new TransferException('The file is too big!');
+			}
+		};
+
 		$client = new Client([
 			'allow_redirect' => [
 				'max' => 8,
@@ -220,8 +228,9 @@ class HTTPRequest implements IHTTPRequest
 		try {
 			$response = $client->get($url);
 			return new GuzzleResponse($response, $url);
-		} catch (RequestException $exception) {
+		} catch (TransferException $exception) {
-			if ($exception->hasResponse()) {
+			if ($exception instanceof RequestException &&
+				$exception->hasResponse()) {
 				return new GuzzleResponse($exception->getResponse(), $url, $exception->getCode(), $exception->getMessage());
 			} else {
 				return new CurlResult($url, '', ['http_code' => $exception->getCode()], $exception->getCode(), $exception->getMessage());

src/Network/IHTTPRequest.php

@@ -79,6 +79,7 @@ interface IHTTPRequest
 	 *                           'timeout' => int Timeout in seconds, default system config value or 60 seconds
 	 *                           'cookiejar' => path to cookie jar file
 	 *                           'header' => header array
+	 *                           'content_length' => int maximum File content length
 	 *
 	 * @return IHTTPResult
 	 */

src/Network/IHTTPResult.php

@@ -82,11 +82,6 @@ interface IHTTPResult
 	 */
 	public function getBody();
 
-	/**
-	 * @return array
-	 */
-	public function getInfo();
-
 	/**
 	 * @return boolean
 	 */

src/Network/Probe.php

@@ -424,16 +424,11 @@ class Probe
 	 */
 	private static function getHideStatus($url)
 	{
-		$curlResult = DI::httpRequest()->get($url);
+		$curlResult = DI::httpRequest()->get($url, false, ['content_length' => 1000000]);
 		if (!$curlResult->isSuccess()) {
 			return false;
 		}
 
-		// If the file is too large then exit
-		if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
-			return false;
-		}
-
 		// If it isn't a HTML file then exit
 		if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
 			return false;

src/Util/ParseUrl.php

@@ -213,7 +213,7 @@ class ParseUrl
 			return $siteinfo;
 		}
 
-		$curlResult = DI::httpRequest()->get($url);
+		$curlResult = DI::httpRequest()->get($url, false, ['content_length' => 1000000]);
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return $siteinfo;
 		}