X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=6359d8607a4699ea1b50f0fdf52d9c12150f8b55;hb=befc2af5043a3afde251721c0d27df695db1bb7e;hp=cfd03684397c9afb023dfdd55c139696c65310a9;hpb=40b11442c2eefa104e4a229f48abad11998e1b49;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index cfd0368439..6359d8607a 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -169,7 +169,7 @@ class Probe
 		Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
 		$xrd = null;
 
-		$curlResult = DI::httpRequest()->get($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+		$curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 		$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 		if ($curlResult->isSuccess()) {
 			$xml = $curlResult->getBody();
@@ -186,7 +186,7 @@ class Probe
 		}
 
 		if (!is_object($xrd) && !empty($url)) {
-			$curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+			$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
 				Logger::info('Probing timeout', ['url' => $url]);
@@ -258,7 +258,7 @@ class Probe
 	 * @return string profile link
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function webfingerDfrn($webbie, &$hcard_url)
+	public static function webfingerDfrn(string $webbie, string &$hcard_url)
 	{
 		$profile_link = '';
 
@@ -423,11 +423,16 @@ class Probe
 	 */
 	private static function getHideStatus($url)
 	{
-		$curlResult = DI::httpRequest()->get($url, false, ['content_length' => 1000000]);
+		$curlResult = DI::httpRequest()->get($url);
 		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;
@@ -936,7 +941,7 @@ class Probe
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-		$curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+		$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];
@@ -1749,6 +1754,10 @@ class Probe
 	 */
 	public static function getFeedLink(string $url, string $body)
 	{
+		if (empty($body)) {
+			return '';
+		}
+
 		$doc = new DOMDocument();
 		if (!@$doc->loadHTML($body)) {
 			return false;
@@ -1796,26 +1805,28 @@ class Probe
 
 		$hrefParts = parse_url($href);
 
-		// Root path case (/path) including relative scheme case (//host/path)
-		if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
-			$path = $hrefParts['path'];
-		} else {
-			$path = $path . '/' . $hrefParts['path'];
-
-			// Resolve arbitrary relative path
-			// Lifted from https://www.php.net/manual/en/function.realpath.php#84012
-			$parts = array_filter(explode('/', $path), 'strlen');
-			$absolutes = array();
-			foreach ($parts as $part) {
-				if ('.' == $part) continue;
-				if ('..' == $part) {
-					array_pop($absolutes);
-				} else {
-					$absolutes[] = $part;
+		if (!empty($hrefParts['path'])) {
+			// Root path case (/path) including relative scheme case (//host/path)
+			if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
+				$path = $hrefParts['path'];
+			} else {
+				$path = $path . '/' . $hrefParts['path'];
+
+				// Resolve arbitrary relative path
+				// Lifted from https://www.php.net/manual/en/function.realpath.php#84012
+				$parts = array_filter(explode('/', $path), 'strlen');
+				$absolutes = array();
+				foreach ($parts as $part) {
+					if ('.' == $part) continue;
+					if ('..' == $part) {
+						array_pop($absolutes);
+					} else {
+						$absolutes[] = $part;
+					}
 				}
-			}
 
-			$path = '/' . implode('/', $absolutes);
+				$path = '/' . implode('/', $absolutes);
+			}
 		}
 
 		// Relative scheme case (//host/path)