diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php index b0e801010d..b2eefcbaa9 100644 --- a/src/Network/CurlResult.php +++ b/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() { diff --git a/src/Network/GuzzleResponse.php b/src/Network/GuzzleResponse.php index c6cab7c9e8..69e88b4025 100644 --- a/src/Network/GuzzleResponse.php +++ b/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() { diff --git a/src/Network/HTTPRequest.php b/src/Network/HTTPRequest.php index e0400b6b94..3e34c01e2a 100644 --- a/src/Network/HTTPRequest.php +++ b/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; @@ -177,10 +178,18 @@ 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, 'on_redirect' => $onRedirect, + 'on_headers' => $onHeaders, 'track_redirect' => true, 'strict' => true, 'referer' => true, @@ -191,8 +200,9 @@ class HTTPRequest implements IHTTPRequest try { $response = $client->get($url); return new GuzzleResponse($response, $url); - } catch (RequestException $exception) { - if ($exception->hasResponse()) { + } catch (TransferException $exception) { + 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()); diff --git a/src/Network/IHTTPRequest.php b/src/Network/IHTTPRequest.php index 3f9b7f27a1..49993085e6 100644 --- a/src/Network/IHTTPRequest.php +++ b/src/Network/IHTTPRequest.php @@ -75,6 +75,7 @@ interface IHTTPRequest * 'nobody' => only return the header * 'cookiejar' => path to cookie jar file * 'header' => header array + * 'content_length' => int maximum File content length * * @return IHTTPResult */ diff --git a/src/Network/IHTTPResult.php b/src/Network/IHTTPResult.php index 5904bcfa38..77ee86976b 100644 --- a/src/Network/IHTTPResult.php +++ b/src/Network/IHTTPResult.php @@ -82,11 +82,6 @@ interface IHTTPResult */ public function getBody(); - /** - * @return array - */ - public function getInfo(); - /** * @return boolean */ diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 3fe035286f..cfd0368439 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -423,16 +423,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; diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index c3cbda70e3..1a81a256ca 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -160,16 +160,11 @@ class ParseUrl return $siteinfo; } - $curlResult = DI::httpRequest()->get($url); + $curlResult = DI::httpRequest()->get($url, false, ['content_length' => 1000000]); if (!$curlResult->isSuccess()) { return $siteinfo; } - // If the file is too large then exit - if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) { - return $siteinfo; - } - // If it isn't a HTML file then exit if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) { return $siteinfo;