X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FHTTPClient.php;h=301d4c3a7add4286592ce6aa3acb9eb38bd9b539;hb=b76634ea0c60d4d26204f13d6d05225116d0ccb0;hp=3011696b8bdfa5291c1116010667e245d4f37bec;hpb=736277dcf05c676b1fb10812ee5cf6e2fe73bb61;p=friendica.git

diff --git a/src/Network/HTTPClient.php b/src/Network/HTTPClient.php
index 3011696b8b..301d4c3a7a 100644
--- a/src/Network/HTTPClient.php
+++ b/src/Network/HTTPClient.php
@@ -21,9 +21,6 @@
 
 namespace Friendica\Network;
 
-use DOMDocument;
-use DomXPath;
-use Friendica\Core\Config\IConfig;
 use Friendica\Core\System;
 use Friendica\Util\Network;
 use Friendica\Util\Profiler;
@@ -32,7 +29,9 @@ use GuzzleHttp\Cookie\FileCookieJar;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Exception\TransferException;
 use GuzzleHttp\RequestOptions;
+use mattwright\URLResolver;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Log\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -44,28 +43,26 @@ class HTTPClient implements IHTTPClient
 	private $logger;
 	/** @var Profiler */
 	private $profiler;
-	/** @var IConfig */
-	private $config;
-	/** @var string */
-	private $userAgent;
 	/** @var Client */
 	private $client;
+	/** @var URLResolver */
+	private $resolver;
 
-	public function __construct(LoggerInterface $logger, Profiler $profiler, IConfig $config, string $userAgent, Client $client)
+	public function __construct(LoggerInterface $logger, Profiler $profiler, Client $client, URLResolver $resolver)
 	{
-		$this->logger    = $logger;
-		$this->profiler  = $profiler;
-		$this->config    = $config;
-		$this->userAgent = $userAgent;
-		$this->client    = $client;
+		$this->logger   = $logger;
+		$this->profiler = $profiler;
+		$this->client   = $client;
+		$this->resolver = $resolver;
 	}
 
 	/**
-	 * @throws HTTPException\InternalServerErrorException
+	 * {@inheritDoc}
 	 */
-	protected function request(string $method, string $url, array $opts = []): IHTTPResult
+	public function request(string $method, string $url, array $opts = []): IHTTPResult
 	{
 		$this->profiler->startRecording('network');
+		$this->logger->debug('Request start.', ['url' => $url, 'method' => $method]);
 
 		if (Network::isLocalLink($url)) {
 			$this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
@@ -98,41 +95,51 @@ class HTTPClient implements IHTTPClient
 
 		$conf = [];
 
-		if (!empty($opts['cookiejar'])) {
-			$jar                           = new FileCookieJar($opts['cookiejar']);
+		if (!empty($opts[HTTPClientOptions::COOKIEJAR])) {
+			$jar                           = new FileCookieJar($opts[HTTPClientOptions::COOKIEJAR]);
 			$conf[RequestOptions::COOKIES] = $jar;
 		}
 
-		$header = [];
+		$headers = [];
 
-		if (!empty($opts['accept_content'])) {
-			array_push($header, 'Accept: ' . $opts['accept_content']);
+		if (!empty($opts[HTTPClientOptions::ACCEPT_CONTENT])) {
+			$headers['Accept'] = $opts[HTTPClientOptions::ACCEPT_CONTENT];
 		}
 
-		if (!empty($opts['header'])) {
-			$header = array_merge($opts['header'], $header);
+		if (!empty($opts[HTTPClientOptions::LEGACY_HEADER])) {
+			$this->logger->notice('Wrong option \'headers\' used.');
+			$headers = array_merge($opts[HTTPClientOptions::LEGACY_HEADER], $headers);
 		}
 
-		if (!empty($opts['headers'])) {
-			$this->logger->notice('Wrong option \'headers\' used.');
-			$header = array_merge($opts['headers'], $header);
+		if (!empty($opts[HTTPClientOptions::HEADERS])) {
+			$headers = array_merge($opts[HTTPClientOptions::HEADERS], $headers);
 		}
 
-		$conf[RequestOptions::HEADERS] = array_merge($this->client->getConfig(RequestOptions::HEADERS), $header);
+		$conf[RequestOptions::HEADERS] = array_merge($this->client->getConfig(RequestOptions::HEADERS), $headers);
 
-		if (!empty($opts['timeout'])) {
-			$conf[RequestOptions::TIMEOUT] = $opts['timeout'];
+		if (!empty($opts[HTTPClientOptions::TIMEOUT])) {
+			$conf[RequestOptions::TIMEOUT] = $opts[HTTPClientOptions::TIMEOUT];
+		}
+
+		if (!empty($opts[HTTPClientOptions::BODY])) {
+			$conf[RequestOptions::BODY] = $opts[HTTPClientOptions::BODY];
+		}
+
+		if (!empty($opts[HTTPClientOptions::AUTH])) {
+			$conf[RequestOptions::AUTH] = $opts[HTTPClientOptions::AUTH];
 		}
 
 		$conf[RequestOptions::ON_HEADERS] = function (ResponseInterface $response) use ($opts) {
-			if (!empty($opts['content_length']) &&
-				$response->getHeaderLine('Content-Length') > $opts['content_length']) {
+			if (!empty($opts[HTTPClientOptions::CONTENT_LENGTH]) &&
+				(int)$response->getHeaderLine('Content-Length') > $opts[HTTPClientOptions::CONTENT_LENGTH]) {
 				throw new TransferException('The file is too big!');
 			}
 		};
 
 		try {
-			$response = $this->client->$method($url, $conf);
+			$this->logger->debug('http request config.', ['url' => $url, 'method' => $method, 'options' => $conf]);
+
+			$response = $this->client->request($method, $url, $conf);
 			return new GuzzleResponse($response, $url);
 		} catch (TransferException $exception) {
 			if ($exception instanceof RequestException &&
@@ -141,14 +148,16 @@ class HTTPClient implements IHTTPClient
 			} else {
 				return new CurlResult($url, '', ['http_code' => $exception->getCode()], $exception->getCode(), '');
 			}
+		} catch (InvalidArgumentException $argumentException) {
+			$this->logger->info('Invalid Argument for HTTP call.', ['url' => $url, 'method' => $method, 'exception' => $argumentException]);
+			return new CurlResult($url, '', ['http_code' => $argumentException->getCode()], $argumentException->getCode(), $argumentException->getMessage());
 		} finally {
+			$this->logger->debug('Request stop.', ['url' => $url, 'method' => $method]);
 			$this->profiler->stopRecording();
 		}
 	}
 
 	/** {@inheritDoc}
-	 *
-	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public function head(string $url, array $opts = []): IHTTPResult
 	{
@@ -165,123 +174,33 @@ class HTTPClient implements IHTTPClient
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * @param int $redirects The recursion counter for internal use - default 0
-	 *
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function post(string $url, $params, array $headers = [], int $timeout = 0, &$redirects = 0)
+	public function post(string $url, $params, array $headers = [], int $timeout = 0): IHTTPResult
 	{
-		$this->profiler->startRecording('network');
-
-		if (Network::isLocalLink($url)) {
-			$this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
-		}
+		$opts = [];
 
-		if (Network::isUrlBlocked($url)) {
-			$this->logger->info('Domain is blocked.' . ['url' => $url]);
-			$this->profiler->stopRecording();
-			return CurlResult::createErrorCurl($url);
-		}
-
-		$ch = curl_init($url);
-
-		if (($redirects > 8) || (!$ch)) {
-			$this->profiler->stopRecording();
-			return CurlResult::createErrorCurl($url);
-		}
-
-		$this->logger->debug('Post_url: start.', ['url' => $url]);
-
-		curl_setopt($ch, CURLOPT_HEADER, true);
-		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);
-
-		if ($this->config->get('system', 'ipv4_resolve', false)) {
-			curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-		}
-
-		@curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-
-		if (intval($timeout)) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-		} else {
-			$curl_time = $this->config->get('system', 'curl_timeout', 60);
-			curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
-		}
+		$opts[HTTPClientOptions::BODY] = $params;
 
 		if (!empty($headers)) {
-			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-		}
-
-		$check_cert = $this->config->get('system', 'verifyssl');
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-
-		if ($check_cert) {
-			@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-		}
-
-		$proxy = $this->config->get('system', 'proxy');
-
-		if (!empty($proxy)) {
-			curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
-			curl_setopt($ch, CURLOPT_PROXY, $proxy);
-			$proxyuser = $this->config->get('system', 'proxyuser');
-			if (!empty($proxyuser)) {
-				curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
-			}
-		}
-
-		// don't let curl abort the entire application
-		// if it throws any errors.
-
-		$s = @curl_exec($ch);
-
-		$curl_info = curl_getinfo($ch);
-
-		$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
-
-		if (!Network::isRedirectBlocked($url) && $curlResponse->isRedirectUrl()) {
-			$redirects++;
-			$this->logger->info('Post redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
-			curl_close($ch);
-			$this->profiler->stopRecording();
-			return $this->post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout);
+			$opts[HTTPClientOptions::HEADERS] = $headers;
 		}
 
-		curl_close($ch);
-
-		$this->profiler->stopRecording();
-
-		// Very old versions of Lighttpd don't like the "Expect" header, so we remove it when needed
-		if ($curlResponse->getReturnCode() == 417) {
-			$redirects++;
-
-			if (empty($headers)) {
-				$headers = ['Expect:'];
-			} else {
-				if (!in_array('Expect:', $headers)) {
-					array_push($headers, 'Expect:');
-				}
-			}
-			$this->logger->info('Server responds with 417, applying workaround', ['url' => $url]);
-			return $this->post($url, $params, $headers, $redirects, $timeout);
+		if (!empty($timeout)) {
+			$opts[HTTPClientOptions::TIMEOUT] = $timeout;
 		}
 
-		$this->logger->debug('Post_url: End.', ['url' => $url]);
-
-		return $curlResponse;
+		return $this->request('post', $url, $opts);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function finalUrl(string $url, int $depth = 1, bool $fetchbody = false)
+	public function finalUrl(string $url)
 	{
+		$this->profiler->startRecording('network');
+
 		if (Network::isLocalLink($url)) {
-			$this->logger->info('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
+			$this->logger->debug('Local link', ['url' => $url, 'callstack' => System::callstack(20)]);
 		}
 
 		if (Network::isUrlBlocked($url)) {
@@ -296,104 +215,15 @@ class HTTPClient implements IHTTPClient
 
 		$url = Network::stripTrackingQueryParams($url);
 
-		if ($depth > 10) {
-			return $url;
-		}
-
 		$url = trim($url, "'");
 
-		$this->profiler->startRecording('network');
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HEADER, 1);
-		curl_setopt($ch, CURLOPT_NOBODY, 1);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
-
-		curl_exec($ch);
-		$curl_info = @curl_getinfo($ch);
-		$http_code = $curl_info['http_code'];
-		curl_close($ch);
-
-		$this->profiler->stopRecording();
-
-		if ($http_code == 0) {
-			return $url;
-		}
-
-		if (in_array($http_code, ['301', '302'])) {
-			if (!empty($curl_info['redirect_url'])) {
-				return $this->finalUrl($curl_info['redirect_url'], ++$depth, $fetchbody);
-			} elseif (!empty($curl_info['location'])) {
-				return $this->finalUrl($curl_info['location'], ++$depth, $fetchbody);
-			}
-		}
+		$urlResult = $this->resolver->resolveURL($url);
 
-		// Check for redirects in the meta elements of the body if there are no redirects in the header.
-		if (!$fetchbody) {
-			return $this->finalUrl($url, ++$depth, true);
-		}
-
-		// if the file is too large then exit
-		if ($curl_info["download_content_length"] > 1000000) {
-			return $url;
-		}
-
-		// if it isn't a HTML file then exit
-		if (!empty($curl_info["content_type"]) && !strstr(strtolower($curl_info["content_type"]), "html")) {
-			return $url;
-		}
-
-		$this->profiler->startRecording('network');
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_NOBODY, 0);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
-
-		$body = curl_exec($ch);
-		curl_close($ch);
-
-		$this->profiler->stopRecording();
-
-		if (trim($body) == "") {
-			return $url;
-		}
-
-		// Check for redirect in meta elements
-		$doc = new DOMDocument();
-		@$doc->loadHTML($body);
-
-		$xpath = new DomXPath($doc);
-
-		$list = $xpath->query("//meta[@content]");
-		foreach ($list as $node) {
-			$attr = [];
-			if ($node->attributes->length) {
-				foreach ($node->attributes as $attribute) {
-					$attr[$attribute->name] = $attribute->value;
-				}
-			}
-
-			if (@$attr["http-equiv"] == 'refresh') {
-				$path = $attr["content"];
-				$pathinfo = explode(";", $path);
-				foreach ($pathinfo as $value) {
-					if (substr(strtolower($value), 0, 4) == "url=") {
-						return $this->finalUrl(substr($value, 4), ++$depth);
-					}
-				}
-			}
+		if ($urlResult->didErrorOccur()) {
+			throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode());
 		}
 
-		return $url;
+		return $urlResult->getURL();
 	}
 
 	/**