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;
/**
* This class handles GServer related functions
const DETECT_NODEINFO_210 = 103;
/**
- * Check for the existance of a server and adds it in the background if not existant
+ * Check for the existence of a server and adds it in the background if not existant
*
* @param string $url
* @param boolean $only_nodeinfo
*/
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);
}
/**
$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'];
}
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);
}
}
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);
}
}
}
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;
return DateTimeFormat::utc('now +1 month');
}
- // The system hadn't been successul contacted for more than a month, so try again in three months
+ // The system hadn't been successful contacted for more than a month, so try again in three months
return DateTimeFormat::utc('now +3 month');
}
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) {
/**
* Reset failed server status by gserver id
*
- * @param int $gsid
+ * @param int $gsid
+ * @param string $network
*/
- public static function setReachableById(int $gsid)
+ public static function setReachableById(int $gsid, string $network)
{
- $gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact'], ['id' => $gsid]);
- if (DBA::isResult($gserver) && $gserver['failed']) {
- self::update(['failed' => false, 'last_contact' => DateTimeFormat::utcNow()], ['id' => $gsid]);
+ $gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact', 'network'], ['id' => $gsid]);
+ 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;
+ }
+ self::update($fields, ['id' => $gsid]);
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);
}
}
{
$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]);
*
* @return string cleaned URL
* @throws Exception
+ * @deprecated since 2023.03 Use cleanUri instead
*/
public static function cleanURL(string $dirtyUrl): string
{
try {
- $url = str_replace('/index.php', '', trim($dirtyUrl, '/'));
- return (string)(new Uri($url))->withUserInfo('')->withQuery('')->withFragment('');
+ return (string)self::cleanUri(new Uri($dirtyUrl));
} catch (\Throwable $e) {
- Logger::warning('Invalid URL', ['dirtyUrl' => $dirtyUrl, 'url' => $url]);
+ Logger::warning('Invalid URL', ['dirtyUrl' => $dirtyUrl]);
return '';
}
}
+ /**
+ * Remove unwanted content from the given URI
+ *
+ * @param UriInterface $dirtyUri
+ *
+ * @return UriInterface cleaned URI
+ * @throws Exception
+ */
+ public static function cleanUri(UriInterface $dirtyUri): string
+ {
+ return $dirtyUri
+ ->withUserInfo('')
+ ->withQuery('')
+ ->withFragment('')
+ ->withPath(
+ preg_replace(
+ '#(?:^|/)index\.php#',
+ '',
+ rtrim($dirtyUri->getPath(), '/')
+ )
+ );
+ }
+
/**
* Detect server data (type, protocol, version number, ...)
* The detected data is then updated or inserted in the gserver table.
*
* @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]);
return false;
}
- // If the URL missmatches, then we mark the old entry as failure
+ // If the URL mismatches, 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;
(((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;
$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;
}
// All following checks are done for systems that always have got a "host-meta" endpoint.
- // With this check we don't have to waste time and ressources for dead systems.
+ // With this check we don't have to waste time and resources for dead systems.
// Also this hopefully prevents us from receiving abuse messages.
if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) {
$validHostMeta = self::validHostMeta($url);
return false;
}
+ if (empty($serverdata['version']) && in_array($serverdata['platform'], ['osada']) && in_array($serverdata['detection-method'], [self::DETECT_CONTACTS, self::DETECT_BODY])) {
+ $serverdata['version'] = self::getNomadVersion($url);
+ }
+
// Detect the directory type
$serverdata['directory-type'] = self::DT_NONE;
}
$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)) {
}
// Sanitize incoming data, see https://github.com/friendica/friendica/issues/8565
- $data['subscribe'] = (bool)$data['subscribe'] ?? false;
+ $data['subscribe'] = (bool)($data['subscribe'] ?? false);
if (!$data['subscribe'] || empty($data['scope']) || !in_array(strtolower($data['scope']), ['all', 'tags'])) {
$data['scope'] = '';
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());
}
}
$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';
}
$serverdata['network'] = Protocol::ACTIVITYPUB;
$serverdata['site_name'] = JsonLD::fetchElement($actor, 'as:name', '@value');
$serverdata['info'] = JsonLD::fetchElement($actor, 'as:summary', '@value');
- if (!empty($actor['as:generator'])) {
+ if (self::isNomad($actor)) {
+ $serverdata['platform'] = self::getNomadName($actor['@id']);
+ $serverdata['version'] = self::getNomadVersion($actor['@id']);
+ $serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
+ } elseif (!empty($actor['as:generator'])) {
$generator = explode(' ', JsonLD::fetchElement($actor['as:generator'], 'as:name', '@value'));
$serverdata['platform'] = strtolower(array_shift($generator));
+ $serverdata['version'] = self::getNomadVersion($actor['@id']);
$serverdata['detection-method'] = self::DETECT_SYSTEM_ACTOR;
} else {
$serverdata['detection-method'] = self::DETECT_AP_ACTOR;
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;
+ }
+
+ /**
+ * Fetch the name of Nomad implementation
+ *
+ * @param string $url
+ * @return string
+ */
+ private static function getNomadName(string $url): string
+ {
+ $name = 'nomad';
+ $curlResult = DI::httpClient()->get($url . '/manifest', 'application/manifest+json');
+ if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+ return $name;
+ }
+
+ $data = json_decode($curlResult->getBody(), true);
+ if (empty($data)) {
+ return $name;
+ }
+
+ return $data['name'] ?? $name;
+ }
+
+ /**
+ * Fetch the version of the Nomad installation
+ *
+ * @param string $url
+ * @return string
+ */
+ private static function getNomadVersion(string $url): string
+ {
+ $curlResult = DI::httpClient()->get($url . '/api/z/1.0/version', HttpClientAccept::JSON);
+ if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+ return '';
+ }
+
+ $data = json_decode($curlResult->getBody(), true);
+ if (empty($data)) {
+ return '';
+ }
+ return $data ?? '';
+ }
+
/**
* Checks if the server contains a valid host meta file
*
$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)) {
}
}
- // Disvover Mastodon servers
+ // Discover Mastodon servers
$accesstoken = DI::config()->get('system', 'instances_social_key');
if (!empty($accesstoken)) {
projects / friendica.git / blobdiff