X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=13dd13af446efc85752ef12b0e5f28648096865d;hb=bbb5440144a6a8421350ef6c0176be9c05df5527;hp=9e32c7b0cb7e6a01b650256b39afd373ce59efa3;hpb=a574146f042d52e2acbec3bd4ce98ad1eeaf6057;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 9e32c7b0cb..13dd13af44 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -44,6 +44,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Network\HTTPException;
+use Friendica\Worker\UpdateGServer;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\UriInterface;
 
@@ -100,11 +101,11 @@ class GServer
 	 */
 	public static function add(string $url, bool $only_nodeinfo = false)
 	{
-		if (self::getID($url, false)) {
+		if (self::getID($url)) {
 			return;
 		}
 
-		Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $url, $only_nodeinfo);
+		UpdateGServer::add(Worker::PRIORITY_LOW, $url, $only_nodeinfo);
 	}
 
 	/**
@@ -126,6 +127,13 @@ class GServer
 		$gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]);
 		if (DBA::isResult($gserver)) {
 			Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url, 'callstack' => System::callstack(20)]);
+
+			if (Network::isUrlBlocked($url)) {
+				self::setBlockedById($gserver['id']);
+			} else {
+				self::setUnblockedById($gserver['id']);
+			}
+
 			return $gserver['id'];
 		}
 
@@ -192,8 +200,9 @@ class GServer
 			return false;
 		} else {
 			if (strtotime($gserver['next_contact']) < time()) {
-				Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+				UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
 			}
+
 			return self::isDefunct($gserver);
 		}
 	}
@@ -211,8 +220,9 @@ class GServer
 			return true;
 		} else {
 			if (strtotime($gserver['next_contact']) < time()) {
-				Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+				UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
 			}
+
 			return !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED);
 		}
 	}
@@ -253,7 +263,7 @@ class GServer
 		}
 
 		if (!empty($server) && (empty($gserver) || strtotime($gserver['next_contact']) < time())) {
-			Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $server, false);
+			UpdateGServer::add(Worker::PRIORITY_LOW, $server);
 		}
 
 		return $reachable;
@@ -338,6 +348,12 @@ class GServer
 			return false;
 		}
 
+		if (Network::isUrlBlocked($server_url)) {
+			Logger::info('Server is blocked', ['url' => $server_url]);
+			self::setBlockedByUrl($server_url);
+			return false;
+		}
+
 		$gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($server_url)]);
 		if (DBA::isResult($gserver)) {
 			if ($gserver['created'] <= DBA::NULL_DATETIME) {
@@ -367,8 +383,13 @@ class GServer
 	public static function setReachableById(int $gsid, string $network)
 	{
 		$gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact', 'network'], ['id' => $gsid]);
-		if (DBA::isResult($gserver) && $gserver['failed']) {
-			$fields = ['failed' => false, 'last_contact' => DateTimeFormat::utcNow()];
+		if (!DBA::isResult($gserver)) {
+			return;
+		}
+
+		$blocked = Network::isUrlBlocked($gserver['url']);
+		if ($gserver['failed']) {
+			$fields = ['failed' => false, 'blocked' => $blocked, 'last_contact' => DateTimeFormat::utcNow()];
 			if (!empty($network) && !in_array($gserver['network'], Protocol::FEDERATED)) {
 				$fields['network'] = $network;
 			}
@@ -376,8 +397,12 @@ class GServer
 			Logger::info('Reset failed status for server', ['url' => $gserver['url']]);
 
 			if (strtotime($gserver['next_contact']) < time()) {
-				Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+				UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
 			}
+		} elseif ($blocked) {
+			self::setBlockedById($gsid);
+		} else {
+			self::setUnblockedById($gsid);
 		}
 	}
 
@@ -390,35 +415,66 @@ class GServer
 	{
 		$gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact'], ['id' => $gsid]);
 		if (DBA::isResult($gserver) && !$gserver['failed']) {
-			self::update(['failed' => true, 'last_failure' => DateTimeFormat::utcNow()], ['id' => $gsid]);
+			self::update(['failed' => true, 'blocked' => Network::isUrlBlocked($gserver['url']), 'last_failure' => DateTimeFormat::utcNow()], ['id' => $gsid]);
 			Logger::info('Set failed status for server', ['url' => $gserver['url']]);
 
 			if (strtotime($gserver['next_contact']) < time()) {
-				Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+				UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
 			}
 		}
 	}
 
+	public static function setUnblockedById(int $gsid)
+	{
+		$gserver = DBA::selectFirst('gserver', ['url'], ["(`blocked` OR `blocked` IS NULL) AND `id` = ?", $gsid]);
+		if (DBA::isResult($gserver)) {
+			self::update(['blocked' => false], ['id' => $gsid]);
+			Logger::info('Set unblocked status for server', ['url' => $gserver['url']]);
+		}
+	}
+
+	public static function setBlockedById(int $gsid)
+	{
+		$gserver = DBA::selectFirst('gserver', ['url'], ["(NOT `blocked` OR `blocked` IS NULL) AND `id` = ?", $gsid]);
+		if (DBA::isResult($gserver)) {
+			self::update(['blocked' => true, 'failed' => true], ['id' => $gsid]);
+			Logger::info('Set blocked status for server', ['url' => $gserver['url']]);
+		}
+	}
+
+	public static function setBlockedByUrl(string $url)
+	{
+		$gserver = DBA::selectFirst('gserver', ['url', 'id'], ["(NOT `blocked` OR `blocked` IS NULL) AND `nurl` = ?", Strings::normaliseLink($url)]);
+		if (DBA::isResult($gserver)) {
+			self::update(['blocked' => true, 'failed' => true], ['id' => $gserver['id']]);
+			Logger::info('Set blocked status for server', ['url' => $gserver['url']]);
+		}
+	}
+
 	/**
 	 * Set failed server status
 	 *
 	 * @param string $url
+	 * @return void
 	 */
 	public static function setFailureByUrl(string $url)
 	{
-		$gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($url)]);
+		$nurl = Strings::normaliseLink($url);
+
+		$gserver = DBA::selectFirst('gserver', [], ['nurl' => $nurl]);
 		if (DBA::isResult($gserver)) {
 			$next_update = self::getNextUpdateDate(false, $gserver['created'], $gserver['last_contact']);
-			self::update(['url' => $url, 'failed' => true, 'last_failure' => DateTimeFormat::utcNow(),
+			self::update(['url' => $url, 'failed' => true, 'blocked' => Network::isUrlBlocked($url), 'last_failure' => DateTimeFormat::utcNow(),
 			'next_contact' => $next_update, 'network' => Protocol::PHANTOM, 'detection-method' => null],
-			['nurl' => Strings::normaliseLink($url)]);
+			['nurl' => $nurl]);
 			Logger::info('Set failed status for existing server', ['url' => $url]);
 			if (self::isDefunct($gserver)) {
 				self::archiveContacts($gserver['id']);
 			}
 			return;
 		}
-		self::insert(['url' => $url, 'nurl' => Strings::normaliseLink($url),
+
+		self::insert(['url' => $url, 'nurl' => $nurl,
 			'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(),
 			'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]);
 		Logger::info('Set failed status for new server', ['url' => $url]);
@@ -488,7 +544,7 @@ class GServer
 	 *
 	 * @return boolean 'true' if server could be detected
 	 */
-	public static function detect(string $url, string $network = '', bool $only_nodeinfo = false): bool
+	private static function detect(string $url, string $network = '', bool $only_nodeinfo = false): bool
 	{
 		Logger::info('Detect server type', ['server' => $url]);
 
@@ -504,7 +560,7 @@ class GServer
 		// If the URL missmatches, then we mark the old entry as failure
 		if (!Strings::compareLink($url, $original_url)) {
 			self::setFailureByUrl($original_url);
-			if (!self::getID($url, true)) {
+			if (!self::getID($url, true) && !Network::isUrlBlocked($url)) {
 				self::detect($url, $network, $only_nodeinfo);
 			}
 			return false;
@@ -525,7 +581,7 @@ class GServer
 				(((parse_url($url, PHP_URL_HOST) != parse_url($valid_url, PHP_URL_HOST)) || (parse_url($url, PHP_URL_PATH) != parse_url($valid_url, PHP_URL_PATH))) && empty(parse_url($valid_url, PHP_URL_PATH)))) {
 				Logger::debug('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $valid_url]);
 				self::setFailureByUrl($url);
-				if (!self::getID($valid_url, true)) {
+				if (!self::getID($valid_url, true) && !Network::isUrlBlocked($valid_url)) {
 					self::detect($valid_url, $network, $only_nodeinfo);
 				}
 				return false;
@@ -539,7 +595,7 @@ class GServer
 				$valid_url = (string)Uri::fromParts($parts);
 
 				self::setFailureByUrl($url);
-				if (!self::getID($valid_url, true)) {
+				if (!self::getID($valid_url, true) && !Network::isUrlBlocked($valid_url)) {
 					self::detect($valid_url, $network, $only_nodeinfo);
 				}
 				return false;
@@ -729,9 +785,9 @@ class GServer
 		}
 
 		$serverdata['next_contact'] = self::getNextUpdateDate(true, '', '', in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]));
-
 		$serverdata['last_contact'] = DateTimeFormat::utcNow();
-		$serverdata['failed'] = false;
+		$serverdata['failed']       = false;
+		$serverdata['blocked']      = false;
 
 		$gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => Strings::normaliseLink($url)]);
 		if (!DBA::isResult($gserver)) {
@@ -1004,10 +1060,11 @@ class GServer
 				Logger::info('Invalid nodeinfo format', ['url' => $url]);
 				continue;
 			}
+
 			if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
-				$nodeinfo1_url = $link['href'];
+				$nodeinfo1_url = Network::addBasePath($link['href'], $httpResult->getUrl());
 			} elseif ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0') {
-				$nodeinfo2_url = $link['href'];
+				$nodeinfo2_url = Network::addBasePath($link['href'], $httpResult->getUrl());
 			}
 		}
 
@@ -1360,7 +1417,7 @@ class GServer
 			$serverdata['detection-method'] = self::DETECT_SITEINFO_JSON;
 		}
 
-		if (!empty($data['url'])) {
+		if (!empty($data['platform'])) {
 			$serverdata['platform'] = strtolower($data['platform']);
 			$serverdata['version'] = $data['version'] ?? 'N/A';
 		}
@@ -1446,6 +1503,10 @@ class GServer
 				$generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value'));
 				$serverdata['platform'] = strtolower(array_shift($generator));
 				$serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
+				if (self::isNomad($actor)) {
+					$serverdata['version']  = $serverdata['platform'];
+					$serverdata['platform'] = 'nomad';
+				}
 			} else {
 				$serverdata['detection-method'] = self::DETECT_AP_ACTOR;
 			}
@@ -1468,6 +1529,27 @@ class GServer
 		return ['server' => $serverdata, 'actor' => ''];
 	}
 
+	/**
+	 * Detect if the given actor is a nomad account
+	 *
+	 * @param array $actor
+	 * @return boolean
+	 */
+	private static function isNomad(array $actor): bool
+	{
+		$tags = JsonLD::fetchElementArray($actor, 'as:tag');
+		if (empty($tags)) {
+			return false;
+		}
+
+		foreach ($tags as $tag) {
+			if ((($tag['as:name'] ?? '') == 'Protocol') && (($tag['sc:value'] ?? '') == 'nomad')) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Checks if the server contains a valid host meta file
 	 *
@@ -2256,7 +2338,7 @@ class GServer
 		$last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
 
 		$gservers = DBA::select('gserver', ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'],
-			["NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update],
+			["NOT `blocked` AND NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update],
 			['order' => ['RAND()']]);
 
 		while ($gserver = DBA::fetch($gservers)) {