<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use DOMDocument;
use DOMXPath;
+use Exception;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
+use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\Register;
-use Friendica\Network\CurlResult;
-use Friendica\Protocol\Diaspora;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
+use Friendica\Protocol\Relay;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
const DETECT_SITEINFO_JSON = 15; // Newer Hubzilla
const DETECT_MASTODON_API = 16;
const DETECT_STATUS_PHP = 17; // Nextcloud
+ const DETECT_V1_CONFIG = 18;
// Standardized endpoints
const DETECT_STATISTICS_JSON = 100;
const DETECT_NODEINFO_1 = 101;
const DETECT_NODEINFO_2 = 102;
+ /**
+ * Check for the existance of a server and adds it in the background if not existant
+ *
+ * @param string $url
+ * @param boolean $only_nodeinfo
+ * @return void
+ */
+ public static function add(string $url, bool $only_nodeinfo = false)
+ {
+ if (self::getID($url, false)) {
+ return;
+ }
+
+ Worker::add(PRIORITY_LOW, 'UpdateGServer', $url, $only_nodeinfo);
+ }
+
/**
* Get the ID for the given server URL
*
if ($no_check || !self::check($url)) {
return null;
}
-
+
return self::getID($url, true);
}
+ /**
+ * Retrieves all the servers which base domain are matching the provided domain pattern
+ *
+ * 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
+ {
+ $likePattern = 'http://' . strtr($pattern, ['_' => '\_', '%' => '\%', '?' => '_', '*' => '%']);
+
+ // The SUBSTRING_INDEX returns everything before the eventual third /, which effectively trims an
+ // eventual server path and keep only the server domain which we're matching against the pattern.
+ $sql = "SELECT `gserver`.*, COUNT(*) AS `contacts`
+ FROM `gserver`
+ LEFT JOIN `contact` ON `gserver`.`id` = `contact`.`gsid`
+ WHERE SUBSTRING_INDEX(`gserver`.`nurl`, '/', 3) LIKE ?
+ AND NOT `gserver`.`failed`
+ GROUP BY `gserver`.`id`";
+
+ $stmt = DI::dba()->p($sql, $likePattern);
+
+ return DI::dba()->toArray($stmt);
+ }
+
/**
* Checks if the given server is reachable
*
return self::check($server, $network, $force);
}
- /**
- * Decides if a server needs to be updated, based upon several date fields
- *
- * @param date $created Creation date of that server entry
- * @param date $updated When had the server entry be updated
- * @param date $last_failure Last failure when contacting that server
- * @param date $last_contact Last time the server had been contacted
- *
- * @return boolean Does the server record needs an update?
- */
- public static function updateNeeded($created, $updated, $last_failure, $last_contact)
+ public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '')
{
+ // On successful contact process check again next week
+ if ($success) {
+ return DateTimeFormat::utc('now +7 day');
+ }
+
$now = strtotime(DateTimeFormat::utcNow());
- if ($updated > $last_contact) {
- $contact_time = strtotime($updated);
+ if ($created > $last_contact) {
+ $contact_time = strtotime($created);
} else {
$contact_time = strtotime($last_contact);
}
- $failure_time = strtotime($last_failure);
- $created_time = strtotime($created);
+ // If the last contact was less than 6 hours before then try again in 6 hours
+ if (($now - $contact_time) < (60 * 60 * 6)) {
+ return DateTimeFormat::utc('now +6 hour');
+ }
- // If there is no "created" time then use the current time
- if ($created_time <= 0) {
- $created_time = $now;
+ // If the last contact was less than 12 hours before then try again in 12 hours
+ if (($now - $contact_time) < (60 * 60 * 12)) {
+ return DateTimeFormat::utc('now +12 hour');
}
- // If the last contact was less than 24 hours then don't update
+ // If the last contact was less than 24 hours before then try tomorrow again
if (($now - $contact_time) < (60 * 60 * 24)) {
- return false;
+ return DateTimeFormat::utc('now +1 day');
}
- // If the last failure was less than 24 hours then don't update
- if (($now - $failure_time) < (60 * 60 * 24)) {
- return false;
+ // If the last contact was less than a week before then try again in a week
+ if (($now - $contact_time) < (60 * 60 * 24 * 7)) {
+ return DateTimeFormat::utc('now +1 week');
}
- // If the last contact was less than a week ago and the last failure is older than a week then don't update
- //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time))
- // return false;
-
- // If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
- if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) {
- return false;
+ // If the last contact was less than two weeks before then try again in two week
+ if (($now - $contact_time) < (60 * 60 * 24 * 14)) {
+ return DateTimeFormat::utc('now +2 week');
}
- // If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month
- if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) {
- return false;
+ // If the last contact was less than a month before then try again in a month
+ if (($now - $contact_time) < (60 * 60 * 24 * 30)) {
+ return DateTimeFormat::utc('now +1 month');
}
- return true;
+ // The system hadn't been successul contacted for more than a month, so try again in three months
+ return DateTimeFormat::utc('now +3 month');
}
/**
public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false)
{
$server_url = self::cleanURL($server_url);
-
if ($server_url == '') {
return false;
}
DBA::update('gserver', $fields, $condition);
}
- $last_contact = $gserver['last_contact'];
- $last_failure = $gserver['last_failure'];
-
- // See discussion under https://forum.friendi.ca/display/0b6b25a8135aabc37a5a0f5684081633
- // It can happen that a zero date is in the database, but storing it again is forbidden.
- if ($last_contact < DBA::NULL_DATETIME) {
- $last_contact = DBA::NULL_DATETIME;
- }
-
- if ($last_failure < DBA::NULL_DATETIME) {
- $last_failure = DBA::NULL_DATETIME;
- }
-
- if (!$force && !self::updateNeeded($gserver['created'], '', $last_failure, $last_contact)) {
+ if (!$force && (strtotime($gserver['next_contact']) > time())) {
Logger::info('No update needed', ['server' => $server_url]);
- return ($last_contact >= $last_failure);
+ return (!$gserver['failed']);
}
- Logger::info('Server is outdated. Start discovery.', ['Server' => $server_url, 'Force' => $force, 'Created' => $gserver['created'], 'Failure' => $last_failure, 'Contact' => $last_contact]);
+ Logger::info('Server is outdated. Start discovery.', ['Server' => $server_url, 'Force' => $force]);
} else {
Logger::info('Server is unknown. Start discovery.', ['Server' => $server_url]);
}
*
* @param string $url
*/
- private static function setFailure(string $url)
+ public static function setFailure(string $url)
{
- if (DBA::exists('gserver', ['nurl' => Strings::normaliseLink($url)])) {
- DBA::update('gserver', ['failed' => true, 'last_failure' => DateTimeFormat::utcNow(), 'detection-method' => null],
+ $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', ['failed' => true, 'last_failure' => DateTimeFormat::utcNow(),
+ 'next_contact' => $next_update, 'detection-method' => null],
['nurl' => Strings::normaliseLink($url)]);
Logger::info('Set failed status for existing server', ['url' => $url]);
return;
// If the URL missmatches, then we mark the old entry as failure
if ($url != $original_url) {
+ /// @todo What to do with "next_contact" here?
DBA::update('gserver', ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()],
['nurl' => Strings::normaliseLink($original_url)]);
}
// When a nodeinfo is present, we don't need to dig further
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
- $curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
+ $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if ($curlResult->isTimeout()) {
self::setFailure($url);
return false;
}
+ // On a redirect follow the new host but mark the old one as failure
+ if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
+ $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
+ if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
+ Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
+ self::setFailure($url);
+ self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
+ return false;
+ }
+ }
+
$nodeinfo = self::fetchNodeinfo($url, $curlResult);
if ($only_nodeinfo && empty($nodeinfo)) {
Logger::info('Invalid nodeinfo in nodeinfo-mode, server is marked as failure', ['url' => $url]);
$basedata = ['detection-method' => self::DETECT_MANUAL];
}
- $curlResult = DI::httpRequest()->get($baseurl, false, ['timeout' => $xrd_timeout]);
+ $curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if ($curlResult->isSuccess()) {
+ if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
+ Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
+ self::setFailure($url);
+ self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
+ return false;
+ }
+
$basedata = self::analyseRootHeader($curlResult, $basedata);
$basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
}
// When the base path doesn't seem to contain a social network we try the complete path.
// Most detectable system have to be installed in the root directory.
// We checked the base to avoid false positives.
- $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout]);
+ $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if ($curlResult->isSuccess()) {
$urldata = self::analyseRootHeader($curlResult, $serverdata);
$urldata = self::analyseRootBody($curlResult, $urldata, $url);
$serverdata = self::detectHubzilla($url, $serverdata);
}
+ if (empty($serverdata['network']) || in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY])) {
+ $serverdata = self::detectPeertube($url, $serverdata);
+ }
+
if (empty($serverdata['network'])) {
$serverdata = self::detectNextcloud($url, $serverdata);
}
}
if ($serverdata['network'] == Protocol::PHANTOM) {
- $serverdata['registered-users'] = $registeredUsers;
+ $serverdata['registered-users'] = max($registeredUsers, 1);
$serverdata = self::detectNetworkViaContacts($url, $serverdata);
}
+ $serverdata['next_contact'] = self::getNextUpdateDate(true);
+
$serverdata['last_contact'] = DateTimeFormat::utcNow();
$serverdata['failed'] = false;
if (!empty($serverdata['network']) && !empty($id) && ($serverdata['network'] != Protocol::PHANTOM)) {
$apcontacts = DBA::count('apcontact', ['gsid' => $id]);
$contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id]);
- $max_users = max($apcontacts, $contacts, $registeredUsers);
+ $max_users = max($apcontacts, $contacts, $registeredUsers, 1);
if ($max_users > $registeredUsers) {
Logger::info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]);
DBA::update('gserver', ['registered-users' => $max_users], ['id' => $id]);
{
Logger::info('Discover relay data', ['server' => $server_url]);
- $curlResult = DI::httpRequest()->get($server_url . '/.well-known/x-social-relay');
+ $curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay');
if (!$curlResult->isSuccess()) {
return;
}
$data['tags'] = [];
}
- $gserver = DBA::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
+ $gserver = DBA::selectFirst('gserver', ['id', 'url', 'network', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
if (!DBA::isResult($gserver)) {
return;
}
}
foreach ($tags as $tag) {
- DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
+ DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], Database::INSERT_IGNORE);
}
}
$fields['batch'] = $data['protocols']['dfrn'];
}
}
+
+ if (isset($data['protocols']['activitypub'])) {
+ $fields['network'] = Protocol::ACTIVITYPUB;
+
+ if (!empty($data['protocols']['activitypub']['actor'])) {
+ $fields['url'] = $data['protocols']['activitypub']['actor'];
+ }
+ if (!empty($data['protocols']['activitypub']['receive'])) {
+ $fields['batch'] = $data['protocols']['activitypub']['receive'];
+ }
+ }
}
- Diaspora::setRelayContact($server_url, $fields);
+
+ Logger::info('Discovery ended', ['server' => $server_url, 'data' => $fields]);
+
+ Relay::updateContact($gserver, $fields);
}
/**
*/
private static function fetchStatistics(string $url)
{
- $curlResult = DI::httpRequest()->get($url . '/statistics.json');
+ $curlResult = DI::httpClient()->get($url . '/statistics.json');
if (!$curlResult->isSuccess()) {
return [];
}
/**
* Detect server type by using the nodeinfo data
*
- * @param string $url address of the server
- * @param CurlResult $curlResult
+ * @param string $url address of the server
+ * @param ICanHandleHttpResponses $httpResult
+ *
* @return array Server data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function fetchNodeinfo(string $url, CurlResult $curlResult)
+ private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult)
{
- if (!$curlResult->isSuccess()) {
+ if (!$httpResult->isSuccess()) {
return [];
}
- $nodeinfo = json_decode($curlResult->getBody(), true);
+ $nodeinfo = json_decode($httpResult->getBody(), true);
if (!is_array($nodeinfo) || empty($nodeinfo['links'])) {
return [];
*/
private static function parseNodeinfo1(string $nodeinfo_url)
{
- $curlResult = DI::httpRequest()->get($nodeinfo_url);
+ $curlResult = DI::httpClient()->get($nodeinfo_url);
if (!$curlResult->isSuccess()) {
return [];
}
if (!empty($nodeinfo['usage']['users']['total'])) {
- $server['registered-users'] = $nodeinfo['usage']['users']['total'];
+ $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1);
}
if (!empty($nodeinfo['protocols']['inbound']) && is_array($nodeinfo['protocols']['inbound'])) {
/**
* 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)
{
- $curlResult = DI::httpRequest()->get($nodeinfo_url);
+ $curlResult = DI::httpClient()->get($nodeinfo_url);
if (!$curlResult->isSuccess()) {
return [];
}
}
if (!empty($nodeinfo['usage']['users']['total'])) {
- $server['registered-users'] = $nodeinfo['usage']['users']['total'];
+ $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1);
}
if (!empty($nodeinfo['protocols'])) {
$protocols = [];
foreach ($nodeinfo['protocols'] as $protocol) {
- $protocols[$protocol] = true;
+ if (is_string($protocol)) {
+ $protocols[$protocol] = true;
+ }
}
if (!empty($protocols['dfrn'])) {
*/
private static function fetchSiteinfo(string $url, array $serverdata)
{
- $curlResult = DI::httpRequest()->get($url . '/siteinfo.json');
+ $curlResult = DI::httpClient()->get($url . '/siteinfo.json');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
}
if (!empty($data['channels_total'])) {
- $serverdata['registered-users'] = $data['channels_total'];
+ $serverdata['registered-users'] = max($data['channels_total'], 1);
}
if (!empty($data['register_policy'])) {
private static function validHostMeta(string $url)
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
- $curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
+ $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
if (!$curlResult->isSuccess()) {
return false;
}
}
}
- $serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts));
+ $serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts), 1);
return $serverdata;
}
{
$serverdata['poco'] = '';
- $curlResult = DI::httpRequest()->get($url . '/poco');
+ $curlResult = DI::httpClient()->get($url . '/poco');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
if (!empty($data['totalResults'])) {
$registeredUsers = $serverdata['registered-users'] ?? 0;
- $serverdata['registered-users'] = max($data['totalResults'], $registeredUsers);
+ $serverdata['registered-users'] = max($data['totalResults'], $registeredUsers, 1);
$serverdata['directory-type'] = self::DT_POCO;
$serverdata['poco'] = $url . '/poco';
}
*/
public static function checkMastodonDirectory(string $url, array $serverdata)
{
- $curlResult = DI::httpRequest()->get($url . '/api/v1/directory?limit=1');
+ $curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
return $serverdata;
}
+ /**
+ * Detects Peertube via their known endpoint
+ *
+ * @param string $url URL of the given server
+ * @param array $serverdata array with server data
+ *
+ * @return array server data
+ */
+ private static function detectPeertube(string $url, array $serverdata)
+ {
+ $curlResult = DI::httpClient()->get($url . '/api/v1/config');
+
+ if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
+ return $serverdata;
+ }
+
+ $data = json_decode($curlResult->getBody(), true);
+ if (empty($data)) {
+ return $serverdata;
+ }
+
+ if (!empty($data['instance']) && !empty($data['serverVersion'])) {
+ $serverdata['platform'] = 'peertube';
+ $serverdata['version'] = $data['serverVersion'];
+ $serverdata['network'] = Protocol::ACTIVITYPUB;
+
+ if (!empty($data['instance']['name'])) {
+ $serverdata['site_name'] = $data['instance']['name'];
+ }
+
+ if (!empty($data['instance']['shortDescription'])) {
+ $serverdata['info'] = $data['instance']['shortDescription'];
+ }
+
+ if (!empty($data['signup'])) {
+ if (!empty($data['signup']['allowed'])) {
+ $serverdata['register_policy'] = Register::OPEN;
+ }
+ }
+
+ if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+ $serverdata['detection-method'] = self::DETECT_V1_CONFIG;
+ }
+ }
+
+ return $serverdata;
+ }
+
/**
* Detects the version number of a given server when it was a NextCloud installation
*
*/
private static function detectNextcloud(string $url, array $serverdata)
{
- $curlResult = DI::httpRequest()->get($url . '/status.php');
+ $curlResult = DI::httpClient()->get($url . '/status.php');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
*/
private static function detectMastodonAlikes(string $url, array $serverdata)
{
- $curlResult = DI::httpRequest()->get($url . '/api/v1/instance');
+ $curlResult = DI::httpClient()->get($url . '/api/v1/instance');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
}
if (!empty($data['stats']['user_count'])) {
- $serverdata['registered-users'] = $data['stats']['user_count'];
+ $serverdata['registered-users'] = max($data['stats']['user_count'], 1);
}
if (!empty($serverdata['version']) && preg_match('/.*?\(compatible;\s(.*)\s(.*)\)/ism', $serverdata['version'], $matches)) {
*/
private static function detectHubzilla(string $url, array $serverdata)
{
- $curlResult = DI::httpRequest()->get($url . '/api/statusnet/config.json');
+ $curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
}
private static function detectGNUSocial(string $url, array $serverdata)
{
// Test for GNU Social
- $curlResult = DI::httpRequest()->get($url . '/api/gnusocial/version.json');
+ $curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json');
if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
$serverdata['platform'] = 'gnusocial';
if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
$serverdata['detection-method'] = self::DETECT_GNUSOCIAL;
}
-
+
return $serverdata;
}
// Test for Statusnet
- $curlResult = DI::httpRequest()->get($url . '/api/statusnet/version.json');
+ $curlResult = DI::httpClient()->get($url . '/api/statusnet/version.json');
if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
*/
private static function detectFriendica(string $url, array $serverdata)
{
- $curlResult = DI::httpRequest()->get($url . '/friendica/json');
+ $curlResult = DI::httpClient()->get($url . '/friendica/json');
if (!$curlResult->isSuccess()) {
- $curlResult = DI::httpRequest()->get($url . '/friendika/json');
+ $curlResult = DI::httpClient()->get($url . '/friendika/json');
$friendika = true;
$platform = 'Friendika';
} else {
return $serverdata;
}
- if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
+ if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
$serverdata['detection-method'] = $friendika ? self::DETECT_FRIENDIKA : self::DETECT_FRIENDICA;
}
*/
private static function analyseRootBody($curlResult, array $serverdata, string $url)
{
+ if (empty($curlResult->getBody())) {
+ return $serverdata;
+ }
+
$doc = new DOMDocument();
@$doc->loadHTML($curlResult->getBody());
$xpath = new DOMXPath($doc);
if (count($version_part) == 2) {
if (in_array($version_part[0], ['WordPress'])) {
- $serverdata['platform'] = strtolower($version_part[0]);
+ $serverdata['platform'] = 'wordpress';
$serverdata['version'] = $version_part[1];
// We still do need a reliable test if some AP plugin is activated
} elseif ($curlResult->inHeader('x-diaspora-version')) {
$serverdata['platform'] = 'diaspora';
$serverdata['network'] = Protocol::DIASPORA;
- $serverdata['version'] = $curlResult->getHeader('x-diaspora-version');
+ $serverdata['version'] = $curlResult->getHeader('x-diaspora-version')[0] ?? '';
} elseif ($curlResult->inHeader('x-friendica-version')) {
$serverdata['platform'] = 'friendica';
$serverdata['network'] = Protocol::DFRN;
- $serverdata['version'] = $curlResult->getHeader('x-friendica-version');
+ $serverdata['version'] = $curlResult->getHeader('x-friendica-version')[0] ?? '';
} else {
return $serverdata;
}
$last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
- $gservers = DBA::p("SELECT `id`, `url`, `nurl`, `network`, `poco`, `directory-type`
- FROM `gserver`
- WHERE NOT `failed`
- AND `directory-type` != ?
- AND `last_poco_query` < ?
- ORDER BY RAND()", self::DT_NONE, $last_update
- );
+ $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],
+ ['order' => ['RAND()']]);
while ($gserver = DBA::fetch($gservers)) {
- if (!GServer::check($gserver['url'], $gserver['network'])) {
- // The server is not reachable? Okay, then we will try it later
- $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
- DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
- continue;
- }
-
Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]);
Worker::add(PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']);
$fields = ['last_poco_query' => DateTimeFormat::utcNow()];
DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
-
+
if (--$no_of_queries == 0) {
break;
}
$protocols = ['activitypub', 'diaspora', 'dfrn', 'ostatus'];
foreach ($protocols as $protocol) {
$query = '{nodes(protocol:"' . $protocol . '"){host}}';
- $curlResult = DI::httpRequest()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
+ $curlResult = DI::httpClient()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
if (!empty($curlResult)) {
$data = json_decode($curlResult, true);
if (!empty($data['data']['nodes'])) {
foreach ($data['data']['nodes'] as $server) {
// Using "only_nodeinfo" since servers that are listed on that page should always have it.
- Worker::add(PRIORITY_LOW, 'UpdateGServer', 'https://' . $server['host'], true);
+ self::add('https://' . $server['host'], true);
}
}
}
if (!empty($accesstoken)) {
$api = 'https://instances.social/api/1.0/instances/list?count=0';
- $header = ['Authorization: Bearer '.$accesstoken];
- $curlResult = DI::httpRequest()->get($api, false, ['headers' => $header]);
+ $curlResult = DI::httpClient()->get($api, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
if ($curlResult->isSuccess()) {
$servers = json_decode($curlResult->getBody(), true);
foreach ($servers['instances'] as $server) {
$url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name'];
- Worker::add(PRIORITY_LOW, 'UpdateGServer', $url);
+ self::add($url);
}
}
}
DI::config()->set('poco', 'last_federation_discovery', time());
}
+
+ /**
+ * Set the protocol for the given server
+ *
+ * @param int $gsid Server id
+ * @param int $protocol Protocol id
+ * @return void
+ * @throws Exception
+ */
+ public static function setProtocol(int $gsid, int $protocol)
+ {
+ if (empty($gsid)) {
+ return;
+ }
+
+ $gserver = DBA::selectFirst('gserver', ['protocol', 'url'], ['id' => $gsid]);
+ if (!DBA::isResult($gserver)) {
+ return;
+ }
+
+ $old = $gserver['protocol'];
+
+ if (!is_null($old)) {
+ /*
+ The priority for the protocols is:
+ 1. ActivityPub
+ 2. DFRN via Diaspora
+ 3. Legacy DFRN
+ 4. Diaspora
+ 5. OStatus
+ */
+
+ // We don't need to change it when nothing is to be changed
+ if ($old == $protocol) {
+ return;
+ }
+
+ // We don't want to mark a server as OStatus when it had been marked with any other protocol before
+ if ($protocol == Post\DeliveryData::OSTATUS) {
+ return;
+ }
+
+ // If the server is marked as ActivityPub then we won't change it to anything different
+ if ($old == Post\DeliveryData::ACTIVITYPUB) {
+ return;
+ }
+
+ // Don't change it to anything lower than DFRN if the new one wasn't ActivityPub
+ if (($old == Post\DeliveryData::DFRN) && ($protocol != Post\DeliveryData::ACTIVITYPUB)) {
+ return;
+ }
+
+ // Don't change it to Diaspora when it is a legacy DFRN server
+ if (($old == Post\DeliveryData::LEGACY_DFRN) && ($protocol == Post\DeliveryData::DIASPORA)) {
+ return;
+ }
+ }
+
+ 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]);
+ }
+
+ /**
+ * Fetch the protocol of the given server
+ *
+ * @param int $gsid Server id
+ * @return int
+ * @throws Exception
+ */
+ public static function getProtocol(int $gsid)
+ {
+ if (empty($gsid)) {
+ return null;
+ }
+
+ $gserver = DBA::selectFirst('gserver', ['protocol'], ['id' => $gsid]);
+ if (DBA::isResult($gserver)) {
+ return $gserver['protocol'];
+ }
+
+ return null;
+ }
}
projects / friendica.git / blobdiff