Use webfinger in apcontact fetch

diff --git a/database.sql b/database.sql
index f4bbebf0811d096dc448b8a13c5b795ce714dd3a..2b6f69f48749f5a27817fb6d25db1654be832b6d 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2020.06-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1351
+-- DB_UPDATE_VERSION 1353
 -- ------------------------------------------
 
 
@@ -85,6 +85,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `notify` varchar(255) COMMENT '',
        `poll` varchar(255) COMMENT '',
        `confirm` varchar(255) COMMENT '',
+       `subscribe` varchar(255) COMMENT '',
        `poco` varchar(255) COMMENT '',
        `aes_allow` boolean NOT NULL DEFAULT '0' COMMENT '',
        `ret-aes` boolean NOT NULL DEFAULT '0' COMMENT '',
@@ -240,6 +241,7 @@ CREATE TABLE IF NOT EXISTS `apcontact` (
        `addr` varchar(255) COMMENT '',
        `alias` varchar(255) COMMENT '',
        `pubkey` text COMMENT '',
+       `subscribe` varchar(255) COMMENT '',
        `baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
        `gsid` int unsigned COMMENT 'Global Server ID',
        `generator` varchar(255) COMMENT 'Name of the contact\'s system',

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 1c5b5d211470957aa3b802ffe118dd6da5a131ea..73c3ad85130d29dcb7bf0d2adf91000a5b9cde57 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -25,6 +25,8 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Network\Probe;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\Network;
@@ -35,56 +37,55 @@ use Friendica\Util\Strings;
 class APContact
 {
        /**
-        * Resolves the profile url from the address by using webfinger
+        * Fetch webfinger data
         *
-        * @param string $addr profile address (user@domain.tld)
-        * @param string $url profile URL. When set then we return "true" when this profile url can be found at the address
-        * @return string|boolean url
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @param string $addr Address
+        * @return array webfinger data
         */
-       private static function addrToUrl($addr, $url = null)
+       public static function fetchWebfingerData(string $addr)
        {
                $addr_parts = explode('@', $addr);
                if (count($addr_parts) != 2) {
-                       return false;
+                       return [];
                }
 
-               $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-
-               $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
-
-               $curlResult = Network::curl($webfinger, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/jrd+json,application/json']);
-               if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-                       $webfinger = Strings::normaliseLink($webfinger);
-
-                       $curlResult = Network::curl($webfinger, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/jrd+json,application/json']);
-
-                       if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-                               return false;
+               $data = ['addr' => $addr];
+               $template = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
+               $webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), 'application/jrd+json');
+               if (empty($webfinger['links'])) {
+                       $template = 'http://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
+                       $webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), 'application/jrd+json');
+                       if (empty($webfinger['links'])) {
+                               return [];
                        }
+                       $data['baseurl'] = 'http://' . $addr_parts[1];
+               } else {
+                       $data['baseurl'] = 'https://' . $addr_parts[1];
                }
 
-               $data = json_decode($curlResult->getBody(), true);
-
-               if (empty($data['links'])) {
-                       return false;
-               }
+               foreach ($webfinger['links'] as $link) {
+                       if (empty($link['rel'])) {
+                               continue;
+                       }
 
-               foreach ($data['links'] as $link) {
-                       if (!empty($url) && !empty($link['href']) && ($link['href'] == $url)) {
-                               return true;
+                       if (!empty($link['template']) && ($link['rel'] == ActivityNamespace::OSTATUSSUB)) {
+                               $data['subscribe'] = $link['template'];
                        }
 
-                       if (empty($link['href']) || empty($link['rel']) || empty($link['type'])) {
-                               continue;
+                       if (!empty($link['href']) && !empty($link['type']) && ($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
+                               $data['url'] = $link['href'];
                        }
 
-                       if (empty($url) && ($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
-                               return $link['href'];
+                       if (!empty($link['href']) && !empty($link['type']) && ($link['rel'] == 'http://webfinger.net/rel/profile-page') && ($link['type'] == 'text/html')) {
+                               $data['alias'] = $link['href'];
                        }
                }
 
-               return false;
+               if (!empty($data['url']) && !empty($data['alias']) && ($data['url'] == $data['alias'])) {
+                       unset($data['alias']);
+               }
+
+               return $data;
        }
 
        /**
@@ -133,11 +134,15 @@ class APContact
                        }
                }
 
-               if (empty(parse_url($url, PHP_URL_SCHEME))) {
-                       $url = self::addrToUrl($url);
-                       if (empty($url)) {
+               $apcontact = [];
+
+               $webfinger = empty(parse_url($url, PHP_URL_SCHEME));
+               if ($webfinger) {
+                       $apcontact = self::fetchWebfingerData($url);
+                       if (empty($apcontact['url'])) {
                                return $fetched_contact;
                        }
+                       $url = $apcontact['url'];
                }
 
                $data = ActivityPub::fetchContent($url);
@@ -151,7 +156,6 @@ class APContact
                        return $fetched_contact;
                }
 
-               $apcontact = [];
                $apcontact['url'] = $compacted['@id'];
                $apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid', '@value');
                $apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
@@ -182,9 +186,11 @@ class APContact
                        $apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
                }
 
-               $apcontact['alias'] = JsonLD::fetchElement($compacted, 'as:url', '@id');
-               if (is_array($apcontact['alias'])) {
-                       $apcontact['alias'] = JsonLD::fetchElement($compacted['as:url'], 'as:href', '@id');
+               if (empty($apcontact['alias'])) {
+                       $apcontact['alias'] = JsonLD::fetchElement($compacted, 'as:url', '@id');
+                       if (is_array($apcontact['alias'])) {
+                               $apcontact['alias'] = JsonLD::fetchElement($compacted['as:url'], 'as:href', '@id');
+                       }
                }
 
                // Quit if none of the basic values are set
@@ -201,10 +207,12 @@ class APContact
                unset($parts['scheme']);
                unset($parts['path']);
 
-               if (!empty($apcontact['nick'])) {
-                       $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
-               } else {
-                       $apcontact['addr'] = '';
+               if (empty($apcontact['addr'])) {
+                       if (!empty($apcontact['nick'])) {
+                               $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
+                       } else {
+                               $apcontact['addr'] = '';
+                       }
                }
 
                $apcontact['pubkey'] = null;
@@ -276,16 +284,17 @@ class APContact
                        }
                }
 
-               if (empty($fetched_contact['baseurl']) || $update) {
-                       $parts = parse_url($apcontact['url']);
-                       unset($parts['path']);
-                       $baseurl = Network::unparseURL($parts);
+               if (!$webfinger && !empty($apcontact['addr'])) {
+                       $data = self::fetchWebfingerData($apcontact['addr']);
+                       if (!empty($data)) {
+                               $apcontact['baseurl'] = $data['baseurl'];
 
-                       // Check if the address is resolvable or the profile url is identical with the base url of the system
-                       if (self::addrToUrl($apcontact['addr'], $apcontact['url']) || Strings::compareLink($apcontact['url'], $baseurl)) {
-                               $apcontact['baseurl'] = $baseurl;
-                       } else {
-                               $apcontact['addr'] = null;
+                               if (empty($apcontact['alias']) && !empty($data['alias'])) {
+                                       $apcontact['alias'] = $data['alias'];
+                               }
+                               if (!empty($data['subscribe'])) {
+                                       $apcontact['subscribe'] = $data['subscribe'];
+                               }
                        }
                }
 

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index bd8b717779f61e2923e889cdad6b526939b20293..db4ef517d54a7270b6423e50a50539cd2496601e 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -389,7 +389,11 @@ class Probe
 
                self::$istimeout = false;
 
-               $data = self::detect($uri, $network, $uid);
+               if ($network != Protocol::ACTIVITYPUB) {
+                       $data = self::detect($uri, $network, $uid);
+               } else {
+                       $data = null;
+               }
 
                // When the previous detection process had got a time out
                // we could falsely detect a Friendica profile as AP profile.
@@ -397,9 +401,7 @@ class Probe
                        $ap_profile = ActivityPub::probeProfile($uri);
 
                        if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
-                               $subscribe = $data['subscribe'] ?? '';
                                $data = $ap_profile;
-                               $data['subscribe'] = $subscribe;
                        } elseif (!empty($ap_profile)) {
                                $ap_profile['batch'] = '';
                                $data = array_merge($ap_profile, $data);
@@ -921,7 +923,7 @@ class Probe
         * @return array webfinger data
         * @throws HTTPException\InternalServerErrorException
         */
-       private static function webfinger($url, $type)
+       public static function webfinger($url, $type)
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 9d6223a748d4d090d060ef3c97a037c70635a4e3..5306c27d3c6fb65b7c6737edbf0590e540046e47 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -170,6 +170,7 @@ class ActivityPub
                $profile['notify'] = $apcontact['inbox'];
                $profile['poll'] = $apcontact['outbox'];
                $profile['pubkey'] = $apcontact['pubkey'];
+               $profile['subscribe'] = $apcontact['subscribe'];
                $profile['baseurl'] = $apcontact['baseurl'];
                $profile['gsid'] = $apcontact['gsid'];
 

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 1a70201258f26bedfb50dfa086b638f663137095..ba244e9a2ffb796e71fcfb9422e12b4279f997a1 100755 (executable)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -54,7 +54,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1352);
+       define('DB_UPDATE_VERSION', 1353);
 }
 
 return [
@@ -304,6 +304,7 @@ return [
                        "addr" => ["type" => "varchar(255)", "comment" => ""],
                        "alias" => ["type" => "varchar(255)", "comment" => ""],
                        "pubkey" => ["type" => "text", "comment" => ""],
+                       "subscribe" => ["type" => "varchar(255)", "comment" => ""],
                        "baseurl" => ["type" => "varchar(255)", "comment" => "baseurl of the ap contact"],
                        "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID"],
                        "generator" => ["type" => "varchar(255)", "comment" => "Name of the contact's system"],