clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use webfinger in apcontact fetch

This commit is contained in:
Michael 2020-06-04 21:55:14 +00:00
parent 5d24a67c40
commit 62217735f0
5 changed files with 75 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2020.06-dev (Red Hot Poker) -- 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 '', `notify` varchar(255) COMMENT '',
`poll` varchar(255) COMMENT '', `poll` varchar(255) COMMENT '',
`confirm` varchar(255) COMMENT '', `confirm` varchar(255) COMMENT '',
`subscribe` varchar(255) COMMENT '',
`poco` varchar(255) COMMENT '', `poco` varchar(255) COMMENT '',
`aes_allow` boolean NOT NULL DEFAULT '0' COMMENT '', `aes_allow` boolean NOT NULL DEFAULT '0' COMMENT '',
`ret-aes` 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 '', `addr` varchar(255) COMMENT '',
`alias` varchar(255) COMMENT '', `alias` varchar(255) COMMENT '',
`pubkey` text COMMENT '', `pubkey` text COMMENT '',
`subscribe` varchar(255) COMMENT '',
`baseurl` varchar(255) COMMENT 'baseurl of the ap contact', `baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
`gsid` int unsigned COMMENT 'Global Server ID', `gsid` int unsigned COMMENT 'Global Server ID',
`generator` varchar(255) COMMENT 'Name of the contact\'s system', `generator` varchar(255) COMMENT 'Name of the contact\'s system',

117
src/Model/APContact.php
View File

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

10
src/Network/Probe.php
View File

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

1
src/Protocol/ActivityPub.php
View File

@ -170,6 +170,7 @@ class ActivityPub
$profile['notify'] = $apcontact['inbox']; $profile['notify'] = $apcontact['inbox'];
$profile['poll'] = $apcontact['outbox']; $profile['poll'] = $apcontact['outbox'];
$profile['pubkey'] = $apcontact['pubkey']; $profile['pubkey'] = $apcontact['pubkey'];
$profile['subscribe'] = $apcontact['subscribe'];
$profile['baseurl'] = $apcontact['baseurl']; $profile['baseurl'] = $apcontact['baseurl'];
$profile['gsid'] = $apcontact['gsid']; $profile['gsid'] = $apcontact['gsid'];

3
static/dbstructure.config.php
View File

@ -54,7 +54,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1352); define('DB_UPDATE_VERSION', 1353);
} }
return [ return [
@ -304,6 +304,7 @@ return [
"addr" => ["type" => "varchar(255)", "comment" => ""], "addr" => ["type" => "varchar(255)", "comment" => ""],
"alias" => ["type" => "varchar(255)", "comment" => ""], "alias" => ["type" => "varchar(255)", "comment" => ""],
"pubkey" => ["type" => "text", "comment" => ""], "pubkey" => ["type" => "text", "comment" => ""],
"subscribe" => ["type" => "varchar(255)", "comment" => ""],
"baseurl" => ["type" => "varchar(255)", "comment" => "baseurl of the ap contact"], "baseurl" => ["type" => "varchar(255)", "comment" => "baseurl of the ap contact"],
"gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID"], "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"], "generator" => ["type" => "varchar(255)", "comment" => "Name of the contact's system"],