Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 12:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Philipp 2020-10-09 20:52:52 +02:00
parent 1a42f35a3c
commit f3cd973cbe
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
7 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Network/CurlResult.php
View file

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

5
src/Network/GuzzleResponse.php
View file

@ -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()
{

14
src/Network/HTTPRequest.php
View file

@ -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());

1
src/Network/IHTTPRequest.php
View file

@ -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
*/

5
src/Network/IHTTPResult.php
View file

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

7
src/Network/Probe.php
View file

@ -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;

7
src/Util/ParseUrl.php
View file

@ -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;