use DomXPath;
use Friendica\App;
use Friendica\Core\Config\IConfig;
-use Friendica\Core\Logger;
use Friendica\Core\System;
-use Friendica\DI;
use Friendica\Util\Network;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/**
* Performs HTTP requests to a given URL
*/
-class HTTPRequest
+class HTTPRequest implements IHTTPRequest
{
/** @var LoggerInterface */
private $logger;
}
/**
- * fetches an URL.
+ * {@inheritDoc}
*
- * @param string $url URL to fetch
- * @param bool $binary default false
- * TRUE if asked to return binary results (file download)
- * @param array $opts (optional parameters) assoziative array with:
- * 'accept_content' => supply Accept: header with 'accept_content' as the value
- * 'timeout' => int Timeout in seconds, default system config value or 60 seconds
- * 'http_auth' => username:password
- * 'novalidate' => do not validate SSL certs, default is to validate using our CA list
- * 'nobody' => only return the header
- * 'cookiejar' => path to cookie jar file
- * 'header' => header array
- * @param int $redirects The recursion counter for internal use - default 0
+ * @param int $redirects The recursion counter for internal use - default 0
*
- * @return CurlResult
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function curl(string $url, bool $binary = false, array $opts = [], int &$redirects = 0)
+ public function get(string $url, bool $binary = false, array $opts = [], int &$redirects = 0)
{
$stamp1 = microtime(true);
}
@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- @curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
+ @curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
$range = intval($this->config->get('system', 'curl_range_bytes', 0));
$redirects++;
$this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
@curl_close($ch);
- return self::curl($curlResponse->getRedirectUrl(), $binary, $opts, $redirects);
+ return $this->get($curlResponse->getRedirectUrl(), $binary, $opts, $redirects);
}
@curl_close($ch);
}
/**
- * Send POST request to $url
+ * {@inheritDoc}
*
- * @param string $url URL to post
- * @param mixed $params array of POST variables
- * @param array $headers HTTP headers
- * @param int $redirects Recursion counter for internal use - default = 0
- * @param int $timeout The timeout in seconds, default system config value or 60 seconds
+ * @param int $redirects The recursion counter for internal use - default 0
*
- * @return CurlResult The content
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0)
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
- curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
+ curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
if ($this->config->get('system', 'ipv4_resolve', false)) {
curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
$redirects++;
$this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
curl_close($ch);
- return self::post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout);
+ return $this->post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout);
}
curl_close($ch);
array_push($headers, 'Expect:');
}
}
- Logger::info('Server responds with 417, applying workaround', ['url' => $url]);
- return self::post($url, $params, $headers, $redirects, $timeout);
+ $this->logger->info('Server responds with 417, applying workaround', ['url' => $url]);
+ return $this->post($url, $params, $headers, $redirects, $timeout);
}
- Logger::log('post_url: end ' . $url, Logger::DATA);
+ $this->logger->debug('Post_url: End.', ['url' => $url]);
return $curlResponse;
}
/**
- * Returns the original URL of the provided URL
- *
- * This function strips tracking query params and follows redirections, either
- * through HTTP code or meta refresh tags. Stops after 10 redirections.
- *
- * @todo Remove the $fetchbody parameter that generates an extraneous HEAD request
- *
- * @see ParseUrl::getSiteinfo
- *
- * @param string $url A user-submitted URL
- * @param int $depth The current redirection recursion level (internal)
- * @param bool $fetchbody Wether to fetch the body or not after the HEAD requests
- * @return string A canonical URL
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * {@inheritDoc}
*/
- public static function finalUrl(string $url, int $depth = 1, bool $fetchbody = false)
+ public function finalUrl(string $url, int $depth = 1, bool $fetchbody = false)
{
$url = Network::stripTrackingQueryParams($url);
curl_setopt($ch, CURLOPT_NOBODY, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 10);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_USERAGENT, DI::httpRequest()->getUserAgent());
+ curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
curl_exec($ch);
$curl_info = @curl_getinfo($ch);
$http_code = $curl_info['http_code'];
curl_close($ch);
- DI::profiler()->saveTimestamp($stamp1, "network", System::callstack());
+ $this->profiler->saveTimestamp($stamp1, "network", System::callstack());
if ($http_code == 0) {
return $url;
if (in_array($http_code, ['301', '302'])) {
if (!empty($curl_info['redirect_url'])) {
- return self::finalUrl($curl_info['redirect_url'], ++$depth, $fetchbody);
+ return $this->finalUrl($curl_info['redirect_url'], ++$depth, $fetchbody);
} elseif (!empty($curl_info['location'])) {
- return self::finalUrl($curl_info['location'], ++$depth, $fetchbody);
+ return $this->finalUrl($curl_info['location'], ++$depth, $fetchbody);
}
}
// Check for redirects in the meta elements of the body if there are no redirects in the header.
if (!$fetchbody) {
- return self::finalUrl($url, ++$depth, true);
+ return $this->finalUrl($url, ++$depth, true);
}
// if the file is too large then exit
curl_setopt($ch, CURLOPT_NOBODY, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 10);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_USERAGENT, DI::httpRequest()->getUserAgent());
+ curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
$body = curl_exec($ch);
curl_close($ch);
- DI::profiler()->saveTimestamp($stamp1, "network", System::callstack());
+ $this->profiler->saveTimestamp($stamp1, "network", System::callstack());
if (trim($body) == "") {
return $url;
$pathinfo = explode(";", $path);
foreach ($pathinfo as $value) {
if (substr(strtolower($value), 0, 4) == "url=") {
- return self::finalUrl(substr($value, 4), ++$depth);
+ return $this->finalUrl(substr($value, 4), ++$depth);
}
}
}
}
/**
- * Curl wrapper
- *
- * If binary flag is true, return binary results.
- * Set the cookiejar argument to a string (e.g. "/tmp/friendica-cookies.txt")
- * to preserve cookies from one request to the next.
+ * {@inheritDoc}
*
- * @param string $url URL to fetch
- * @param bool $binary default false
- * TRUE if asked to return binary results (file download)
- * @param int $timeout Timeout in seconds, default system config value or 60 seconds
- * @param string $accept_content supply Accept: header with 'accept_content' as the value
- * @param string $cookiejar Path to cookie jar file
- * @param int $redirects The recursion counter for internal use - default 0
+ * @param int $redirects The recursion counter for internal use - default 0
*
- * @return string The fetched content
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function fetchUrl(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+ public function fetch(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
{
- $ret = $this->fetchUrlFull($url, $binary, $timeout, $accept_content, $cookiejar, $redirects);
+ $ret = $this->fetchFull($url, $binary, $timeout, $accept_content, $cookiejar, $redirects);
return $ret->getBody();
}
/**
- * Curl wrapper with array of return values.
+ * {@inheritDoc}
*
- * Inner workings and parameters are the same as @ref fetchUrl but returns an array with
- * all the information collected during the fetch.
+ * @param int $redirects The recursion counter for internal use - default 0
*
- * @param string $url URL to fetch
- * @param bool $binary default false
- * TRUE if asked to return binary results (file download)
- * @param int $timeout Timeout in seconds, default system config value or 60 seconds
- * @param string $accept_content supply Accept: header with 'accept_content' as the value
- * @param string $cookiejar Path to cookie jar file
- * @param int $redirects The recursion counter for internal use - default 0
- *
- * @return CurlResult With all relevant information, 'body' contains the actual fetched content.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function fetchUrlFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+ public function fetchFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
{
- return $this->curl(
+ return $this->get(
$url,
$binary,
[
}
/**
- * Returns the current UserAgent as a String
- *
- * @return string the UserAgent as a String
+ * {@inheritDoc}
*/
public function getUserAgent()
{