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
*
return DateTimeFormat::utc('now +3 month');
}
- /**
- * 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)
- {
- $now = strtotime(DateTimeFormat::utcNow());
-
- if ($updated > $last_contact) {
- $contact_time = strtotime($updated);
- } else {
- $contact_time = strtotime($last_contact);
- }
-
- $failure_time = strtotime($last_failure);
- $created_time = strtotime($created);
-
- // 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 24 hours then don't update
- if (($now - $contact_time) < (60 * 60 * 24)) {
- return false;
- }
-
- // 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 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 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;
- }
-
- return true;
- }
-
/**
* Checks the state of the given server.
*
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]);
}
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::httpRequest()->get($url, ['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]);
$curlResult = DI::httpRequest()->get($baseurl, ['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);
}
$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);
}
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]);
}
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'])) {
}
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'])) {
}
if (!empty($data['channels_total'])) {
- $serverdata['registered-users'] = $data['channels_total'];
+ $serverdata['registered-users'] = max($data['channels_total'], 1);
}
if (!empty($data['register_policy'])) {
}
}
- $serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts));
+ $serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts), 1);
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';
}
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::httpRequest()->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
*
}
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)) {
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
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);
}
}
}
foreach ($servers['instances'] as $server) {
$url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name'];
- Worker::add(PRIORITY_LOW, 'UpdateGServer', $url);
+ self::add($url);
}
}
}
projects / friendica.git / blobdiff