X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=b5991934b4912d16caeec3b6b0204ca3631cc43f;hb=737b04d7e2cb2452f9ac25071d2cf67544e01476;hp=465bbeff76aff4d19a8da4a76a7bc2995e484850;hpb=0a4119adaf6294bf43d135a0f435c1dd677c50e0;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 465bbeff76..b5991934b4 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -1,20 +1,32 @@ . + * */ -namespace Friendica\Network; -/** - * @file src/Network/Probe.php - * Functions for probing URL - */ +namespace Friendica\Network; use DOMDocument; use DomXPath; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; +use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -30,13 +42,37 @@ use Friendica\Util\XML; /** * This class contain functions for probing URL - * */ 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 * @@ -47,7 +83,7 @@ class Probe private static function rearrangeData($data) { $fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "account-type", - "community", "keywords", "location", "about", "gender", "hide", + "community", "keywords", "location", "about", "hide", "batch", "notify", "poll", "request", "confirm", "poco", "following", "followers", "inbox", "outbox", "sharedinbox", "priority", "network", "pubkey", "baseurl"]; @@ -106,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 = Config::get('system', 'xrd_timeout', 20); + $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']); @@ -119,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()) { @@ -222,11 +268,29 @@ class Probe } /** - * Check an URI for LRDD data + * Get the link for the remote follow page for a given profile link * - * 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 sting $profile + * @return string Remote follow page link + */ + public static function getRemoteFollowLink(string $profile) + { + $follow_link = ''; + + $links = self::lrdd($profile); + + if (!empty($links) && is_array($links)) { + foreach ($links as $link) { + if ($link['@attributes']['rel'] === ActivityNamespace::OSTATUSSUB) { + $follow_link = $link['@attributes']['template']; + } + } + } + return $follow_link; + } + + /** + * Check an URI for LRDD data * * @param string $uri Address that should be probed * @@ -248,7 +312,7 @@ class Probe return []; } - $host = $parts["host"]; + $host = $parts['scheme'] . '://' . $parts["host"]; if (!empty($parts["port"])) { $host .= ':'.$parts["port"]; } @@ -817,9 +881,6 @@ class Probe if (!empty($profile['description'])) { $data['about'] = $profile['description']; } - if (!empty($profile['gender'])) { - $data['gender'] = $profile['gender']; - } if (!empty($profile['keywords'])) { $keywords = implode(', ', $profile['keywords']); if (!empty($keywords)) { @@ -834,9 +895,6 @@ class Probe if (!empty($profile['country'])) { $loc['country-name'] = $profile['country']; } - if (!empty($profile['hometown'])) { - $loc['locality'] = $profile['hometown']; - } $location = Profile::formatLocation($loc); if (!empty($location)) { $data['location'] = $location; @@ -859,7 +917,7 @@ class Probe */ private static function webfinger($url, $type) { - $xrd_timeout = Config::get('system', 'xrd_timeout', 20); + $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); $curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]); if ($curlResult->isTimeout()) { @@ -983,10 +1041,6 @@ class Probe $data["about"] = $json["about"]; } - if (!empty($json["gender"])) { - $data["gender"] = $json["gender"]; - } - if (!empty($json["key"])) { $data["pubkey"] = $json["key"]; }