X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=b5991934b4912d16caeec3b6b0204ca3631cc43f;hb=737b04d7e2cb2452f9ac25071d2cf67544e01476;hp=b547c430564e9977e69e2f13e88faa8869bab271;hpb=da124af6edfd788877307decc187fe7f0ff2b4c7;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index b547c43056..b5991934b4 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -26,6 +26,7 @@ use DomXPath;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -47,6 +48,31 @@ class Probe
 	private static $baseurl;
 	private static $istimeout;
 
+	/**
+	 * Remove stuff from an URI that doesn't belong there
+	 *
+	 * @param string $URI
+	 * @return string Cleaned URI
+	 */
+	public static function cleanURI(string $URI)
+	{
+		// At first remove leading and trailing junk
+		$URI = trim($URI, "@#?:/ \t\n\r\0\x0B");
+
+		$parts = parse_url($URI);
+
+		if (empty($parts['scheme'])) {
+			return $URI;
+		}
+
+		// Remove the URL fragment, since these shouldn't be part of any profile URL
+		unset($parts['fragment']);
+
+		$URI = Network::unparseURL($parts);
+
+		return $URI;
+	}
+
 	/**
 	 * Rearrange the array so that it always has the same order
 	 *
@@ -116,12 +142,18 @@ class Probe
 		// Reset the static variable
 		self::$baseurl = '';
 
-		$ssl_url = "https://".$host."/.well-known/host-meta";
-		$url = "http://".$host."/.well-known/host-meta";
+		// Handles the case when the hostname contains the scheme
+		if (!parse_url($host, PHP_URL_SCHEME)) {
+			$ssl_url = "https://" . $host . "/.well-known/host-meta";
+			$url = "http://" . $host . "/.well-known/host-meta";
+		} else {
+			$ssl_url = $host . "/.well-known/host-meta";
+			$url = '';
+		}
 
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-		Logger::log("Probing for ".$host, Logger::DEBUG);
+		Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
 		$xrd = null;
 
 		$curlResult = Network::curl($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
@@ -129,14 +161,18 @@ class Probe
 		if ($curlResult->isSuccess()) {
 			$xml = $curlResult->getBody();
 			$xrd = XML::parseString($xml, false);
-			$host_url = 'https://'.$host;
+			if (!empty($url)) {
+				$host_url = 'https://' . $host;
+			} else {
+				$host_url = $host;
+			}
 		} elseif ($curlResult->isTimeout()) {
 			Logger::info('Probing timeout', ['url' => $ssl_url], Logger::DEBUG);
 			self::$istimeout = true;
 			return false;
 		}
 
-		if (!is_object($xrd)) {
+		if (!is_object($xrd) && !empty($url)) {
 			$curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
@@ -256,10 +292,6 @@ class Probe
 	/**
 	 * Check an URI for LRDD data
 	 *
-	 * this is a replacement for the "lrdd" function.
-	 * It isn't used in this class and has some redundancies in the code.
-	 * When time comes we can check the existing calls for "lrdd" if we can rework them.
-	 *
 	 * @param string $uri Address that should be probed
 	 *
 	 * @return array uri data
@@ -280,7 +312,7 @@ class Probe
 				return [];
 			}
 
-			$host = $parts["host"];
+			$host = $parts['scheme'] . '://' . $parts["host"];
 			if (!empty($parts["port"])) {
 				$host .= ':'.$parts["port"];
 			}