X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=a3a3d1abbc6bcb94390a2ebaea48d975e60b5ace;hb=50746bad55eb2453764dffa143785b19fdb61d6c;hp=fc70b4fe4735f9215db462f586d041bc1f478409;hpb=dad05f1c7655c0c4e72fc5736a9cf770e663fe6b;p=friendica.git diff --git a/src/Model/GServer.php b/src/Model/GServer.php index fc70b4fe47..a3a3d1abbc 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -1,6 +1,6 @@ Strings::normaliseLink($url)]); if (DBA::isResult($gserver)) { Logger::debug('Got ID for URL', ['id' => $gserver['id'], 'url' => $url, 'callstack' => System::callstack(20)]); @@ -139,7 +143,9 @@ class GServer * The pattern is a simple fnmatch() pattern with ? for single wildcard and * for multiple wildcard * * @param string $pattern + * * @return array + * * @throws Exception */ public static function listByDomainPattern(string $pattern): array @@ -161,32 +167,114 @@ class GServer } /** - * Checks if the given server is reachable + * Checks if the given server array is unreachable for a long time now * - * @param string $profile URL of the given profile - * @param string $server URL of the given server (If empty, taken from profile) - * @param string $network Network value that is used, when detection failed - * @param boolean $force Force an update. + * @param integer $gsid + * @return boolean + */ + private static function isDefunct(array $gserver): bool + { + return ($gserver['failed'] || in_array($gserver['network'], Protocol::FEDERATED)) && + ($gserver['last_contact'] >= $gserver['created']) && + ($gserver['last_contact'] < $gserver['last_failure']) && + ($gserver['last_contact'] < DateTimeFormat::utc('now - 90 days')); + } + + /** + * Checks if the given server id is unreachable for a long time now * - * @return boolean 'true' if server seems vital + * @param integer $gsid + * @return boolean + */ + public static function isDefunctById(int $gsid): bool + { + $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'last_contact', 'last_failure', 'created', 'failed', 'network'], ['id' => $gsid]); + if (empty($gserver)) { + return false; + } else { + if (strtotime($gserver['next_contact']) < time()) { + UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']); + } + + return self::isDefunct($gserver); + } + } + + /** + * Checks if the given server id is reachable + * + * @param integer $gsid + * @return boolean */ - public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false) + public static function isReachableById(int $gsid): bool { - if ($server == '') { - $contact = Contact::getByURL($profile, null, ['baseurl']); - if (!empty($contact['baseurl'])) { - $server = $contact['baseurl']; + $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed', 'network'], ['id' => $gsid]); + if (empty($gserver)) { + return true; + } else { + if (strtotime($gserver['next_contact']) < time()) { + UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']); } + + return !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED); } + } - if ($server == '') { + /** + * Checks if the given server is reachable + * + * @param array $contact Contact that should be checked + * + * @return boolean 'true' if server seems vital + */ + public static function reachable(array $contact): bool + { + if (!empty($contact['gsid'])) { + $gsid = $contact['gsid']; + } elseif (!empty($contact['baseurl'])) { + $server = $contact['baseurl']; + } elseif ($contact['network'] == Protocol::DIASPORA) { + $parts = parse_url($contact['url']); + unset($parts['path']); + $server = (string)Uri::fromParts($parts); + } else { return true; } - return self::check($server, $network, $force); + if (!empty($gsid)) { + $condition = ['id' => $gsid]; + } else { + $condition = ['nurl' => Strings::normaliseLink($server)]; + } + + $gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed', 'network'], $condition); + if (empty($gserver)) { + $reachable = true; + } else { + $reachable = !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED); + $server = $gserver['url']; + } + + if (!empty($server) && (empty($gserver) || strtotime($gserver['next_contact']) < time())) { + UpdateGServer::add(Worker::PRIORITY_LOW, $server); + } + + return $reachable; } - public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '', bool $undetected = false) + /** + * Calculate the next update day + * + * @param bool $success + * @param string $created + * @param string $last_contact + * @param bool $undetected + * + * @return string + * + * @throws Exception + */ + public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '', bool $undetected = false): string { // On successful contact process check again next week when it is a detected system. // When we haven't detected the system, it could be a static website or a really old system. @@ -246,7 +334,7 @@ class GServer * * @return boolean 'true' if server seems vital */ - public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false) + public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false): bool { $server_url = self::cleanURL($server_url); if ($server_url == '') { @@ -258,7 +346,7 @@ class GServer if ($gserver['created'] <= DBA::NULL_DATETIME) { $fields = ['created' => DateTimeFormat::utcNow()]; $condition = ['nurl' => Strings::normaliseLink($server_url)]; - DBA::update('gserver', $fields, $condition); + self::update($fields, $condition); } if (!$force && (strtotime($gserver['next_contact']) > time())) { @@ -273,45 +361,124 @@ class GServer return self::detect($server_url, $network, $only_nodeinfo); } + /** + * Reset failed server status by gserver id + * + * @param int $gsid + * @param string $network + */ + 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 (!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()) { + UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']); + } + } + } + + /** + * Set failed server status by gserver id + * + * @param int $gsid + */ + public static function setFailureById(int $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]); + Logger::info('Set failed status for server', ['url' => $gserver['url']]); + + if (strtotime($gserver['next_contact']) < time()) { + UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']); + } + } + } + /** * Set failed server status * * @param string $url */ - public static function setFailure(string $url) + public static function setFailureByUrl(string $url) { $gserver = DBA::selectFirst('gserver', [], ['nurl' => Strings::normaliseLink($url)]); if (DBA::isResult($gserver)) { $next_update = self::getNextUpdateDate(false, $gserver['created'], $gserver['last_contact']); - DBA::update('gserver', ['url' => $url, 'failed' => true, 'last_failure' => DateTimeFormat::utcNow(), + self::update(['url' => $url, 'failed' => true, 'last_failure' => DateTimeFormat::utcNow(), 'next_contact' => $next_update, 'network' => Protocol::PHANTOM, 'detection-method' => null], ['nurl' => Strings::normaliseLink($url)]); Logger::info('Set failed status for existing server', ['url' => $url]); + if (self::isDefunct($gserver)) { + self::archiveContacts($gserver['id']); + } return; } - DBA::insert('gserver', ['url' => $url, 'nurl' => Strings::normaliseLink($url), + self::insert(['url' => $url, 'nurl' => Strings::normaliseLink($url), 'network' => Protocol::PHANTOM, 'created' => DateTimeFormat::utcNow(), 'failed' => true, 'last_failure' => DateTimeFormat::utcNow()]); Logger::info('Set failed status for new server', ['url' => $url]); } + /** + * Archive server related contacts and inboxes + * + * @param integer $gsid + * @return void + */ + private static function archiveContacts(int $gsid) + { + Contact::update(['archive' => true], ['gsid' => $gsid]); + DBA::update('inbox-status', ['archive' => true], ['gsid' => $gsid]); + } + /** * Remove unwanted content from the given URL * - * @param string $url + * @param string $dirtyUrl + * * @return string cleaned URL + * @throws Exception + * @deprecated since 2023.03 Use cleanUri instead + */ + public static function cleanURL(string $dirtyUrl): string + { + try { + return (string)self::cleanUri(new Uri($dirtyUrl)); + } catch (\Throwable $e) { + 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 cleanURL(string $url) + public static function cleanUri(UriInterface $dirtyUri): string { - $url = trim($url, '/'); - $url = str_replace('/index.php', '', $url); - - $urlparts = parse_url($url); - unset($urlparts['user']); - unset($urlparts['pass']); - unset($urlparts['query']); - unset($urlparts['fragment']); - return Network::unparseURL($urlparts); + return $dirtyUri + ->withUserInfo('') + ->withQuery('') + ->withFragment('') + ->withPath( + preg_replace( + '#(?:^|/)index\.php#', + '', + rtrim($dirtyUri->getPath(), '/') + ) + ); } /** @@ -324,7 +491,7 @@ class GServer * * @return boolean 'true' if server could be detected */ - public static function detect(string $url, string $network = '', bool $only_nodeinfo = false) + public static function detect(string $url, string $network = '', bool $only_nodeinfo = false): bool { Logger::info('Detect server type', ['server' => $url]); @@ -337,50 +504,56 @@ class GServer return false; } - if (!Network::isUrlValid($url)) { - self::setFailure($url); - return false; - } - // If the URL missmatches, then we mark the old entry as failure - if (Strings::normaliseLink($url) != Strings::normaliseLink($original_url)) { - self::setFailure($original_url); - self::detect($url, $network, $only_nodeinfo); + if (!Strings::compareLink($url, $original_url)) { + self::setFailureByUrl($original_url); + if (!self::getID($url, true)) { + self::detect($url, $network, $only_nodeinfo); + } return false; } - // On a redirect follow the new host but mark the old one as failure - try { - $finalurl = rtrim(DI::httpClient()->finalUrl($url), '/'); - } catch (TransferException $exception) { - Logger::notice('Error fetching final URL.', ['url' => $url, 'exception' => $exception]); - self::setFailure($url); + $valid_url = Network::isUrlValid($url); + if (!$valid_url) { + self::setFailureByUrl($url); return false; - } + } else { + $valid_url = rtrim($valid_url, '/'); + } + + if (!Strings::compareLink($url, $valid_url)) { + // We only follow redirects when the path stays the same or the target url has no path. + // Some systems have got redirects on their landing page to a single account page. This check handles it. + if (((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))) || + (((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)) { + self::detect($valid_url, $network, $only_nodeinfo); + } + return false; + } - if (empty($finalurl)) { - Logger::notice('Empty redirected URL.', ['url' => $url]); - return false; - } + if ((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)) && + (parse_url($url, PHP_URL_PATH) == '')) { + Logger::debug('Found redirect. Mark old entry as failure and redirect to the basepath.', ['old' => $url, 'new' => $valid_url]); + $parts = parse_url($valid_url); + unset($parts['path']); + $valid_url = (string)Uri::fromParts($parts); - // We only follow redirects when the path stays the same or the target url has no path. - // Some systems have got redirects on their landing page to a single account page. This check handles it. - if (((parse_url($url, PHP_URL_HOST) != parse_url($finalurl, PHP_URL_HOST)) && (parse_url($url, PHP_URL_PATH) == parse_url($finalurl, PHP_URL_PATH))) || - (((parse_url($url, PHP_URL_HOST) != parse_url($finalurl, PHP_URL_HOST)) || (parse_url($url, PHP_URL_PATH) != parse_url($finalurl, PHP_URL_PATH))) && empty(parse_url($finalurl, PHP_URL_PATH)))) { - Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $finalurl]); - self::setFailure($url); - self::detect($finalurl, $network, $only_nodeinfo); - return false; + self::setFailureByUrl($url); + if (!self::getID($valid_url, true)) { + self::detect($valid_url, $network, $only_nodeinfo); + } + return false; + } + Logger::debug('Found redirect, but ignore it.', ['old' => $url, 'new' => $valid_url]); } - if ((parse_url($url, PHP_URL_HOST) == parse_url($finalurl, PHP_URL_HOST)) && - (parse_url($url, PHP_URL_PATH) == parse_url($finalurl, PHP_URL_PATH)) && - (parse_url($url, PHP_URL_SCHEME) != parse_url($finalurl, PHP_URL_SCHEME))) { - if (!Network::isUrlValid($finalurl)) { - self::setFailure($finalurl); - } else { - $url = $finalurl; - } + if ((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)) && + (parse_url($url, PHP_URL_SCHEME) != parse_url($valid_url, PHP_URL_SCHEME))) { + $url = $valid_url; } $in_webroot = empty(parse_url($url, PHP_URL_PATH)); @@ -388,7 +561,7 @@ class GServer // When a nodeinfo is present, we don't need to dig further $curlResult = DI::httpClient()->get($url . '/.well-known/x-nodeinfo2', HttpClientAccept::JSON); if ($curlResult->isTimeout()) { - self::setFailure($url); + self::setFailureByUrl($url); return false; } @@ -400,7 +573,7 @@ class GServer if ($only_nodeinfo && empty($serverdata)) { Logger::info('Invalid nodeinfo in nodeinfo-mode, server is marked as failure', ['url' => $url]); - self::setFailure($url); + self::setFailureByUrl($url); return false; } elseif (empty($serverdata)) { $serverdata = ['detection-method' => self::DETECT_MANUAL, 'network' => Protocol::PHANTOM, 'platform' => '', 'version' => '', 'site_name' => '', 'info' => '']; @@ -439,7 +612,7 @@ class GServer } if (!$curlResult->isSuccess() || empty($curlResult->getBody())) { - self::setFailure($url); + self::setFailureByUrl($url); return false; } @@ -508,7 +681,7 @@ class GServer // Most servers aren't installed in a subdirectory, so we declare this entry as failed if (($serverdata['network'] == Protocol::PHANTOM) && !empty(parse_url($url, PHP_URL_PATH)) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL])) { - self::setFailure($url); + self::setFailureByUrl($url); return false; } @@ -524,6 +697,11 @@ class GServer $serverdata = self::detectNetworkViaContacts($url, $serverdata); } + if (($serverdata['network'] == Protocol::PHANTOM) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY])) { + self::setFailureByUrl($url); + return false; + } + // Detect the directory type $serverdata['directory-type'] = self::DT_NONE; @@ -541,8 +719,13 @@ class GServer $serverdata['registered-users'] = $serverdata['registered-users'] ?? 0; + // Numbers above a reasonable value (10 millions) are ignored + if ($serverdata['registered-users'] > 10000000) { + $serverdata['registered-users'] = 0; + } + // On an active server there has to be at least a single user - if (!in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]) && ($serverdata['registered-users'] == 0)) { + if (!in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED]) && ($serverdata['registered-users'] <= 0)) { $serverdata['registered-users'] = 1; } elseif (in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) { $serverdata['registered-users'] = 0; @@ -553,16 +736,13 @@ class GServer $serverdata['last_contact'] = DateTimeFormat::utcNow(); $serverdata['failed'] = false; - // Limit the length on incoming fields - $serverdata = DBStructure::getFieldsForTable('gserver', $serverdata); - $gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => Strings::normaliseLink($url)]); if (!DBA::isResult($gserver)) { $serverdata['created'] = DateTimeFormat::utcNow(); - $ret = DBA::insert('gserver', $serverdata); + $ret = self::insert($serverdata); $id = DBA::lastInsertId(); } else { - $ret = DBA::update('gserver', $serverdata, ['nurl' => $serverdata['nurl']]); + $ret = self::update($serverdata, ['nurl' => $serverdata['nurl']]); $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]); if (DBA::isResult($gserver)) { $id = $gserver['id']; @@ -576,14 +756,14 @@ class GServer $max_users = max($apcontacts, $contacts); if ($max_users > $serverdata['registered-users']) { Logger::info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]); - DBA::update('gserver', ['registered-users' => $max_users], ['id' => $id]); + self::update(['registered-users' => $max_users], ['id' => $id]); } if (empty($serverdata['active-month-users'])) { $contacts = DBA::count('contact', ["`uid` = ? AND `gsid` = ? AND NOT `failed` AND `last-item` > ?", 0, $id, DateTimeFormat::utc('now - 30 days')]); if ($contacts > 0) { Logger::info('Update monthly users', ['id' => $id, 'url' => $serverdata['nurl'], 'monthly-users' => $contacts]); - DBA::update('gserver', ['active-month-users' => $contacts], ['id' => $id]); + self::update(['active-month-users' => $contacts], ['id' => $id]); } } @@ -591,7 +771,7 @@ class GServer $contacts = DBA::count('contact', ["`uid` = ? AND `gsid` = ? AND NOT `failed` AND `last-item` > ?", 0, $id, DateTimeFormat::utc('now - 180 days')]); if ($contacts > 0) { Logger::info('Update halfyear users', ['id' => $id, 'url' => $serverdata['nurl'], 'halfyear-users' => $contacts]); - DBA::update('gserver', ['active-halfyear-users' => $contacts], ['id' => $id]); + self::update(['active-halfyear-users' => $contacts], ['id' => $id]); } } } @@ -612,6 +792,9 @@ class GServer * Fetch relay data from a given server url * * @param string $server_url address of the server + * + * @return void + * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function discoverRelay(string $server_url) @@ -644,7 +827,7 @@ class GServer if (($gserver['relay-subscribe'] != $data['subscribe']) || ($gserver['relay-scope'] != $data['scope'])) { $fields = ['relay-subscribe' => $data['subscribe'], 'relay-scope' => $data['scope']]; - DBA::update('gserver', $fields, ['id' => $gserver['id']]); + self::update($fields, ['id' => $gserver['id']]); } DBA::delete('gserver-tag', ['gserver-id' => $gserver['id']]); @@ -711,7 +894,7 @@ class GServer * * @return array server data */ - private static function fetchStatistics(string $url, array $serverdata) + private static function fetchStatistics(string $url, array $serverdata): array { $curlResult = DI::httpClient()->get($url . '/statistics.json', HttpClientAccept::JSON); if (!$curlResult->isSuccess()) { @@ -801,9 +984,10 @@ class GServer * @param ICanHandleHttpResponses $httpResult * * @return array Server data + * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult) + private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult): array { if (!$httpResult->isSuccess()) { return []; @@ -851,10 +1035,12 @@ class GServer * Parses Nodeinfo 1 * * @param string $nodeinfo_url address of the nodeinfo path + * * @return array Server data + * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function parseNodeinfo1(string $nodeinfo_url) + private static function parseNodeinfo1(string $nodeinfo_url): array { $curlResult = DI::httpClient()->get($nodeinfo_url, HttpClientAccept::JSON); if (!$curlResult->isSuccess()) { @@ -947,11 +1133,14 @@ class GServer * Parses Nodeinfo 2 * * @see https://git.feneas.org/jaywink/nodeinfo2 + * * @param string $nodeinfo_url address of the nodeinfo path + * * @return array Server data + * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function parseNodeinfo2(string $nodeinfo_url) + private static function parseNodeinfo2(string $nodeinfo_url): array { $curlResult = DI::httpClient()->get($nodeinfo_url, HttpClientAccept::JSON); if (!$curlResult->isSuccess()) { @@ -963,8 +1152,11 @@ class GServer return []; } - $server = ['detection-method' => self::DETECT_NODEINFO_2, - 'register_policy' => Register::CLOSED]; + $server = [ + 'detection-method' => self::DETECT_NODEINFO_2, + 'register_policy' => Register::CLOSED, + 'platform' => 'unknown', + ]; if (!empty($nodeinfo['openRegistrations'])) { $server['register_policy'] = Register::OPEN; @@ -1050,11 +1242,14 @@ class GServer * Parses NodeInfo2 protocol 1.0 * * @see https://github.com/jaywink/nodeinfo2/blob/master/PROTOCOL.md + * * @param string $nodeinfo_url address of the nodeinfo path + * * @return array Server data + * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function parseNodeinfo210(ICanHandleHttpResponses $httpResult) + private static function parseNodeinfo210(ICanHandleHttpResponses $httpResult): array { if (!$httpResult->isSuccess()) { return []; @@ -1152,7 +1347,7 @@ class GServer * * @return array server data */ - private static function fetchSiteinfo(string $url, array $serverdata) + private static function fetchSiteinfo(string $url, array $serverdata): array { $curlResult = DI::httpClient()->get($url . '/siteinfo.json', HttpClientAccept::JSON); if (!$curlResult->isSuccess()) { @@ -1170,7 +1365,7 @@ class GServer if (!empty($data['url'])) { $serverdata['platform'] = strtolower($data['platform']); - $serverdata['version'] = $data['version']; + $serverdata['version'] = $data['version'] ?? 'N/A'; } if (!empty($data['plugins'])) { @@ -1229,7 +1424,17 @@ class GServer return $serverdata; } - private static function fetchDataFromSystemActor(array $data, array $serverdata) + /** + * Fetches server data via an ActivityPub account with url of that server + * + * @param string $url URL of the given server + * @param array $serverdata array with server data + * + * @return array server data + * + * @throws Exception + */ + private static function fetchDataFromSystemActor(array $data, array $serverdata): array { if (empty($data)) { return ['server' => $serverdata, 'actor' => '']; @@ -1273,15 +1478,15 @@ class GServer * * @return boolean 'true' if the server seems to be vital */ - private static function validHostMeta(string $url) + private static function validHostMeta(string $url): bool { $xrd_timeout = DI::config()->get('system', 'xrd_timeout'); - $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]); + $curlResult = DI::httpClient()->get($url . Probe::HOST_META, HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]); if (!$curlResult->isSuccess()) { return false; } - $xrd = XML::parseString($curlResult->getBody()); + $xrd = XML::parseString($curlResult->getBody(), true); if (!is_object($xrd)) { return false; } @@ -1319,7 +1524,7 @@ class GServer * * @return array server data */ - private static function detectNetworkViaContacts(string $url, array $serverdata) + private static function detectNetworkViaContacts(string $url, array $serverdata): array { $contacts = []; @@ -1371,7 +1576,7 @@ class GServer * * @return array server data */ - private static function checkPoCo(string $url, array $serverdata) + private static function checkPoCo(string $url, array $serverdata): array { $serverdata['poco'] = ''; @@ -1403,7 +1608,7 @@ class GServer * * @return array server data */ - public static function checkMastodonDirectory(string $url, array $serverdata) + public static function checkMastodonDirectory(string $url, array $serverdata): array { $curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1', HttpClientAccept::JSON); if (!$curlResult->isSuccess()) { @@ -1430,7 +1635,7 @@ class GServer * * @return array server data */ - private static function detectPeertube(string $url, array $serverdata) + private static function detectPeertube(string $url, array $serverdata): array { $curlResult = DI::httpClient()->get($url . '/api/v1/config', HttpClientAccept::JSON); if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { @@ -1478,7 +1683,7 @@ class GServer * * @return array server data */ - private static function detectNextcloud(string $url, array $serverdata, bool $validHostMeta) + private static function detectNextcloud(string $url, array $serverdata, bool $validHostMeta): array { $curlResult = DI::httpClient()->get($url . '/status.php', HttpClientAccept::JSON); if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { @@ -1506,7 +1711,16 @@ class GServer return $serverdata; } - private static function fetchWeeklyUsage(string $url, array $serverdata) { + /** + * Fetches weekly usage data + * + * @param string $url URL of the given server + * @param array $serverdata array with server data + * + * @return array server data + */ + private static function fetchWeeklyUsage(string $url, array $serverdata): array + { $curlResult = DI::httpClient()->get($url . '/api/v1/instance/activity', HttpClientAccept::JSON); if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { return $serverdata; @@ -1545,7 +1759,7 @@ class GServer * * @return array server data */ - private static function detectMastodonAlikes(string $url, array $serverdata) + private static function detectMastodonAlikes(string $url, array $serverdata): array { $curlResult = DI::httpClient()->get($url . '/api/v1/instance', HttpClientAccept::JSON); if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { @@ -1617,7 +1831,7 @@ class GServer * * @return array server data */ - private static function detectHubzilla(string $url, array $serverdata) + private static function detectHubzilla(string $url, array $serverdata): array { $curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json', HttpClientAccept::JSON); if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { @@ -1694,7 +1908,7 @@ class GServer * * @return boolean */ - private static function toBoolean($val) + private static function toBoolean($val): bool { if (($val == 'true') || ($val == 1)) { return true; @@ -1713,7 +1927,7 @@ class GServer * * @return array server data */ - private static function detectGNUSocial(string $url, array $serverdata) + private static function detectGNUSocial(string $url, array $serverdata): array { // Test for GNU Social $curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json', HttpClientAccept::JSON); @@ -1768,7 +1982,7 @@ class GServer * * @return array server data */ - private static function detectFriendica(string $url, array $serverdata) + private static function detectFriendica(string $url, array $serverdata): array { // There is a bug in some versions of Friendica that will return an ActivityStream actor when the content type "application/json" is requested. // Because of this me must not use ACCEPT_JSON here. @@ -1843,16 +2057,16 @@ class GServer * * @return array server data */ - private static function analyseRootBody($curlResult, array $serverdata) + private static function analyseRootBody($curlResult, array $serverdata): array { if (empty($curlResult->getBody())) { return $serverdata; } - if (file_exists(__DIR__ . '/../../static/generator.config.php')) { - require __DIR__ . '/../../static/generator.config.php'; + if (file_exists(__DIR__ . '/../../static/platforms.config.php')) { + require __DIR__ . '/../../static/platforms.config.php'; } else { - throw new HTTPException\InternalServerErrorException('Invalid generator file'); + throw new HTTPException\InternalServerErrorException('Invalid platform file'); } $platforms = array_merge($ap_platforms, $dfrn_platforms, $zap_platforms, $platforms); @@ -2002,7 +2216,7 @@ class GServer * * @return array server data */ - private static function analyseRootHeader($curlResult, array $serverdata) + private static function analyseRootHeader($curlResult, array $serverdata): array { if ($curlResult->getHeader('server') == 'Mastodon') { $serverdata['platform'] = 'mastodon'; @@ -2050,13 +2264,13 @@ class GServer while ($gserver = DBA::fetch($gservers)) { Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]); - Worker::add(PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']); + Worker::add(Worker::PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']); Logger::info('Update directory', ['server' => $gserver['url'], 'id' => $gserver['id']]); - Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', $gserver); + Worker::add(Worker::PRIORITY_LOW, 'UpdateServerDirectory', $gserver); $fields = ['last_poco_query' => DateTimeFormat::utcNow()]; - DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]); + self::update($fields, ['nurl' => $gserver['nurl']]); if (--$no_of_queries == 0) { break; @@ -2071,7 +2285,7 @@ class GServer */ private static function discoverFederation() { - $last = DI::config()->get('poco', 'last_federation_discovery'); + $last = DI::keyValue()->get('poco_last_federation_discovery'); if ($last) { $next = $last + (24 * 60 * 60); @@ -2106,14 +2320,16 @@ class GServer if ($curlResult->isSuccess()) { $servers = json_decode($curlResult->getBody(), true); - foreach ($servers['instances'] as $server) { - $url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name']; - self::add($url); + if (!empty($servers['instances'])) { + foreach ($servers['instances'] as $server) { + $url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name']; + self::add($url); + } } } } - DI::config()->set('poco', 'last_federation_discovery', time()); + DI::keyValue()->set('poco_last_federation_discovery', time()); } /** @@ -2121,7 +2337,7 @@ class GServer * * @param int $gsid Server id * @param int $protocol Protocol id - * @return void + * * @throws Exception */ public static function setProtocol(int $gsid, int $protocol) @@ -2174,17 +2390,19 @@ class GServer } Logger::info('Protocol for server', ['protocol' => $protocol, 'old' => $old, 'id' => $gsid, 'url' => $gserver['url'], 'callstack' => System::callstack(20)]); - DBA::update('gserver', ['protocol' => $protocol], ['id' => $gsid]); + self::update(['protocol' => $protocol], ['id' => $gsid]); } /** * Fetch the protocol of the given server * * @param int $gsid Server id - * @return int + * + * @return ?int One of Post\DeliveryData protocol constants or null if unknown or gserver is missing + * * @throws Exception */ - public static function getProtocol(int $gsid) + public static function getProtocol(int $gsid): ?int { if (empty($gsid)) { return null; @@ -2197,4 +2415,40 @@ class GServer return null; } + + /** + * Update rows in the gserver table. + * Enforces gserver table field maximum sizes to avoid "Data too long" database errors + * + * @param array $fields + * @param array $condition + * + * @return bool + * + * @throws Exception + */ + public static function update(array $fields, array $condition): bool + { + $fields = DI::dbaDefinition()->truncateFieldsForTable('gserver', $fields); + + return DBA::update('gserver', $fields, $condition); + } + + /** + * Insert a row into the gserver table. + * Enforces gserver table field maximum sizes to avoid "Data too long" database errors + * + * @param array $fields + * @param int $duplicate_mode What to do on a duplicated entry + * + * @return bool + * + * @throws Exception + */ + public static function insert(array $fields, int $duplicate_mode = Database::INSERT_DEFAULT): bool + { + $fields = DI::dbaDefinition()->truncateFieldsForTable('gserver', $fields); + + return DBA::insert('gserver', $fields, $duplicate_mode); + } }