Discover directory type

This commit is contained in:
Michael 2019-12-21 13:48:20 +00:00
parent fab85255b6
commit 90408b9d49
3 changed files with 63 additions and 10 deletions

View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2019.12-rc (Dalmatian Bellflower) -- Friendica 2019.12-rc (Dalmatian Bellflower)
-- DB_UPDATE_VERSION 1326 -- DB_UPDATE_VERSION 1328
-- ------------------------------------------ -- ------------------------------------------
@ -470,6 +470,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
`info` text COMMENT '', `info` text COMMENT '',
`register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '', `register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '',
`registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT 'Number of registered users', `registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT 'Number of registered users',
`directory-type` tinyint DEFAULT 0 COMMENT 'Type of directory service (Poco, Mastodon)',
`poco` varchar(255) NOT NULL DEFAULT '' COMMENT '', `poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '', `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`network` char(4) NOT NULL DEFAULT '' COMMENT '', `network` char(4) NOT NULL DEFAULT '' COMMENT '',

View file

@ -26,6 +26,10 @@ use Friendica\Network\Probe;
*/ */
class GServer class GServer
{ {
// Directory types
const DT_NONE = 0;
const DT_POCO = 1;
const DT_MASTODON = 2;
/** /**
* Checks if the given server is reachable * Checks if the given server is reachable
* *
@ -51,12 +55,12 @@ class GServer
/** /**
* Decides if a server needs to be updated, based upon several date fields * Decides if a server needs to be updated, based upon several date fields
* *
* @param date $created Creation date of that server entry * @param date $created Creation date of that server entry
* @param date $updated When had the server entry be updated * @param date $updated When had the server entry be updated
* @param date $last_failure Last failure when contacting that server * @param date $last_failure Last failure when contacting that server
* @param date $last_contact Last time the server had been contacted * @param date $last_contact Last time the server had been contacted
* *
* @return boolean Does the server record needs an update? * @return boolean Does the server record needs an update?
*/ */
public static function updateNeeded($created, $updated, $last_failure, $last_contact) public static function updateNeeded($created, $updated, $last_failure, $last_contact)
@ -167,8 +171,24 @@ class GServer
*/ */
public static function detect(string $url, string $network = '') public static function detect(string $url, string $network = '')
{ {
Logger::info('Detect server type', ['server' => $url]);
$serverdata = []; $serverdata = [];
$original_url = $url;
// Remove URL content that is not supposed to exist for a server url
$urlparts = parse_url($url);
unset($urlparts['user']);
unset($urlparts['pass']);
unset($urlparts['query']);
unset($urlparts['fragment']);
$url = Network::unparseURL($urlparts);
// If the URL missmatches, then we mark the old entry as failure
if ($url != $original_url) {
DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($original_url)]);
}
// When a nodeinfo is present, we don't need to dig further // When a nodeinfo is present, we don't need to dig further
$xrd_timeout = Config::get('system', 'xrd_timeout'); $xrd_timeout = Config::get('system', 'xrd_timeout');
$curlResult = Network::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]); $curlResult = Network::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
@ -238,7 +258,10 @@ class GServer
$serverdata = $nodeinfo; $serverdata = $nodeinfo;
} }
// Detect the directory type
$serverdata['directory-type'] = self::DT_NONE;
$serverdata = self::checkPoCo($url, $serverdata); $serverdata = self::checkPoCo($url, $serverdata);
$serverdata = self::checkMastodonDirectory($url, $serverdata);
// We can't detect the network type. Possibly it is some system that we don't know yet // We can't detect the network type. Possibly it is some system that we don't know yet
if (empty($serverdata['network'])) { if (empty($serverdata['network'])) {
@ -604,7 +627,7 @@ class GServer
$protocols[$protocol] = true; $protocols[$protocol] = true;
} }
if (!empty($protocols['friendica'])) { if (!empty($protocols['dfrn'])) {
$server['network'] = Protocol::DFRN; $server['network'] = Protocol::DFRN;
} elseif (!empty($protocols['activitypub'])) { } elseif (!empty($protocols['activitypub'])) {
$server['network'] = Protocol::ACTIVITYPUB; $server['network'] = Protocol::ACTIVITYPUB;
@ -795,6 +818,8 @@ class GServer
*/ */
private static function checkPoCo(string $url, array $serverdata) private static function checkPoCo(string $url, array $serverdata)
{ {
$serverdata['poco'] = '';
$curlResult = Network::curl($url. '/poco'); $curlResult = Network::curl($url. '/poco');
if (!$curlResult->isSuccess()) { if (!$curlResult->isSuccess()) {
return $serverdata; return $serverdata;
@ -808,9 +833,35 @@ class GServer
if (!empty($data['totalResults'])) { if (!empty($data['totalResults'])) {
$registeredUsers = $serverdata['registered-users'] ?? 0; $registeredUsers = $serverdata['registered-users'] ?? 0;
$serverdata['registered-users'] = max($data['totalResults'], $registeredUsers); $serverdata['registered-users'] = max($data['totalResults'], $registeredUsers);
$serverdata['directory-type'] = self::DT_POCO;
$serverdata['poco'] = $url . '/poco'; $serverdata['poco'] = $url . '/poco';
} else { }
$serverdata['poco'] = '';
return $serverdata;
}
/**
* Checks if the given server does have a Mastodon style directory endpoint.
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
*
* @return array server data
*/
public static function checkMastodonDirectory(string $url, array $serverdata)
{
$curlResult = Network::curl($url. '/api/v1/directory?limit=1');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
$data = json_decode($curlResult->getBody(), true);
if (empty($data)) {
return $serverdata;
}
if (count($data) == 1) {
$serverdata['directory-type'] = self::DT_MASTODON;
} }
return $serverdata; return $serverdata;
@ -1242,13 +1293,13 @@ class GServer
/** /**
* Update the user directory of a given gserver record * Update the user directory of a given gserver record
* *
* @param array $gserver gserver record * @param array $gserver gserver record
*/ */
public static function updateDirectory(array $gserver) public static function updateDirectory(array $gserver)
{ {
/// @todo Add Mastodon API directory /// @todo Add Mastodon API directory
if (!empty($gserver['poco'])) { if (!empty($gserver['poco'])) {
PortableContact::discoverSingleServer($gserver['id']); PortableContact::discoverSingleServer($gserver['id']);
} }

View file

@ -34,7 +34,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1327); define('DB_UPDATE_VERSION', 1328);
} }
return [ return [
@ -526,6 +526,7 @@ return [
"info" => ["type" => "text", "comment" => ""], "info" => ["type" => "text", "comment" => ""],
"register_policy" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""], "register_policy" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
"registered-users" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Number of registered users"], "registered-users" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Number of registered users"],
"directory-type" => ["type" => "tinyint", "default" => "0", "comment" => "Type of directory service (Poco, Mastodon)"],
"poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""], "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],