X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=c77e20818685c7110552b556d99ffc730abde7b5;hb=f81192b4c3838480154301ac25cbbbed58593380;hp=67ce2b66bf73d9c689ef5f778404edc42c1fb358;hpb=150c0e0750cd4aca38d450e896fcd2fccbbe164b;p=friendica.git diff --git a/src/Model/APContact.php b/src/Model/APContact.php index 67ce2b66bf..c77e208186 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -1,6 +1,6 @@ $addr]; - $template = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr); - $webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), HttpClientAccept::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), HttpClientAccept::JRD_JSON); - if (empty($webfinger['links'])) { - return []; - } - $data['baseurl'] = 'http://' . $addr_parts[1]; - } else { - $data['baseurl'] = 'https://' . $addr_parts[1]; + $webfinger = Probe::getWebfingerArray($addr); + if (empty($webfinger['webfinger']['links'])) { + return []; } - foreach ($webfinger['links'] as $link) { + $data['baseurl'] = $webfinger['baseurl']; + + foreach ($webfinger['webfinger']['links'] as $link) { if (empty($link['rel'])) { continue; } @@ -127,6 +119,11 @@ class APContact return []; } + if (!Network::isValidHttpUrl($url) && !filter_var($url, FILTER_VALIDATE_EMAIL)) { + Logger::info('Invalid URL', ['url' => $url]); + return []; + } + $fetched_contact = []; if (empty($update)) { @@ -160,7 +157,10 @@ class APContact $apcontact = []; - $webfinger = empty(parse_url($url, PHP_URL_SCHEME)); + // Mastodon profile short-form URL https://domain.tld/@user doesn't return AP data when queried + // with HTTPSignature::fetchRaw, but returns the correct data when provided to WebFinger + // @see https://github.com/friendica/friendica/issues/13359 + $webfinger = empty(parse_url($url, PHP_URL_SCHEME)) || strpos($url, '@') !== false; if ($webfinger) { $apcontact = self::fetchWebfingerData($url); if (empty($apcontact['url'])) { @@ -176,7 +176,7 @@ class APContact $cachekey = 'apcontact:' . ItemURI::getIdByURI($url); $result = DI::cache()->get($cachekey); if (!is_null($result)) { - Logger::notice('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]); + Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'result' => $result]); if (!empty($fetched_contact)) { return $fetched_contact; } @@ -196,17 +196,22 @@ class APContact if (empty($data)) { $local_owner = []; - $curlResult = HTTPSignature::fetchRaw($url); - $failed = empty($curlResult) || empty($curlResult->getBody()) || - (!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410)); + try { + $curlResult = HTTPSignature::fetchRaw($url); + $failed = empty($curlResult) || empty($curlResult->getBody()) || + (!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410)); - if (!$failed) { - $data = json_decode($curlResult->getBody(), true); - $failed = empty($data) || !is_array($data); - } + if (!$failed) { + $data = json_decode($curlResult->getBody(), true); + $failed = empty($data) || !is_array($data); + } - if (!$failed && ($curlResult->getReturnCode() == 410)) { - $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone']; + if (!$failed && ($curlResult->getReturnCode() == 410)) { + $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone']; + } + } catch (\Exception $exception) { + Logger::notice('Error fetching url', ['url' => $url, 'exception' => $exception]); + $failed = true; } if ($failed) { @@ -226,14 +231,11 @@ class APContact $apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id'); $apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id'); $apcontact['inbox'] = (JsonLD::fetchElement($compacted, 'ldp:inbox', '@id') ?? ''); - self::unarchiveInbox($apcontact['inbox'], false); - $apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id'); $apcontact['sharedinbox'] = ''; if (!empty($compacted['as:endpoints'])) { $apcontact['sharedinbox'] = (JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id') ?? ''); - self::unarchiveInbox($apcontact['sharedinbox'], true); } $apcontact['featured'] = JsonLD::fetchElement($compacted, 'toot:featured', '@id'); @@ -264,6 +266,11 @@ class APContact $apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id'); if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) { $apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id'); + } elseif (empty($apcontact['photo'])) { + $photo = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:url'); + if (!empty($photo[0]['@id'])) { + $apcontact['photo'] = $photo[0]['@id']; + } } $apcontact['header'] = JsonLD::fetchElement($compacted, 'as:image', '@id'); @@ -291,14 +298,11 @@ class APContact return $fetched_contact; } - $parts = parse_url($apcontact['url']); - unset($parts['scheme']); - unset($parts['path']); - if (empty($apcontact['addr'])) { - if (!empty($apcontact['nick']) && is_array($parts)) { - $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts)); - } else { + try { + $apcontact['addr'] = $apcontact['nick'] . '@' . (new Uri($apcontact['url']))->getAuthority(); + } catch (\Throwable $e) { + Logger::warning('Unable to coerce APContact URL into a UriInterface object', ['url' => $apcontact['url'], 'error' => $e->getMessage()]); $apcontact['addr'] = ''; } } @@ -324,7 +328,7 @@ class APContact if (!empty($local_owner)) { $following = ActivityPub\Transmitter::getContacts($local_owner, [Contact::SHARING, Contact::FRIEND], 'following'); } else { - $following = ActivityPub::fetchContent($apcontact['following']); + $following = HTTPSignature::fetch($apcontact['following']); } if (!empty($following['totalItems'])) { // Mastodon seriously allows for this condition? @@ -340,7 +344,7 @@ class APContact if (!empty($local_owner)) { $followers = ActivityPub\Transmitter::getContacts($local_owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers'); } else { - $followers = ActivityPub::fetchContent($apcontact['followers']); + $followers = HTTPSignature::fetch($apcontact['followers']); } if (!empty($followers['totalItems'])) { // Mastodon seriously allows for this condition? @@ -356,7 +360,7 @@ class APContact if (!empty($local_owner)) { $statuses_count = self::getStatusesCount($local_owner); } else { - $outbox = ActivityPub::fetchContent($apcontact['outbox']); + $outbox = HTTPSignature::fetch($apcontact['outbox']); $statuses_count = $outbox['totalItems'] ?? 0; } if (!empty($statuses_count)) { @@ -371,26 +375,24 @@ class APContact $apcontact['discoverable'] = JsonLD::fetchElement($compacted, 'toot:discoverable', '@value'); - // To-Do - - // Unhandled - // tag, attachment, image, nomadicLocations, signature, movedTo, liked - - // Unhandled from Misskey - // sharedInbox, isCat + if (!empty($apcontact['photo'])) { + $apcontact['photo'] = Network::addBasePath($apcontact['photo'], $apcontact['url']); - // Unhandled from Kroeg - // kroeg:blocks, updated + if (!Network::isValidHttpUrl($apcontact['photo'])) { + Logger::warning('Invalid URL for photo', ['url' => $apcontact['url'], 'photo' => $apcontact['photo']]); + $apcontact['photo'] = ''; + } + } // When the photo is too large, try to shorten it by removing parts if (strlen($apcontact['photo'] ?? '') > 255) { $parts = parse_url($apcontact['photo']); unset($parts['fragment']); - $apcontact['photo'] = (string)Uri::fromParts($parts); + $apcontact['photo'] = (string)Uri::fromParts((array)$parts); if (strlen($apcontact['photo']) > 255) { unset($parts['query']); - $apcontact['photo'] = (string)Uri::fromParts($parts); + $apcontact['photo'] = (string)Uri::fromParts((array)$parts); } if (strlen($apcontact['photo']) > 255) { @@ -430,6 +432,12 @@ class APContact $apcontact['gsid'] = null; } + self::unarchiveInbox($apcontact['inbox'], false, $apcontact['gsid']); + + if (!empty($apcontact['sharedinbox'])) { + self::unarchiveInbox($apcontact['sharedinbox'], true, $apcontact['gsid']); + } + if ($apcontact['url'] == $apcontact['alias']) { $apcontact['alias'] = null; } @@ -520,7 +528,7 @@ class APContact { if (!empty($apcontact['inbox'])) { Logger::info('Set inbox status to failure', ['inbox' => $apcontact['inbox']]); - HTTPSignature::setInboxStatus($apcontact['inbox'], false); + HTTPSignature::setInboxStatus($apcontact['inbox'], false, false, $apcontact['gsid']); } if (!empty($apcontact['sharedinbox'])) { @@ -530,7 +538,7 @@ class APContact if (!$available) { // If all known personal inboxes are failing then set their shared inbox to failure as well Logger::info('Set shared inbox status to failure', ['sharedinbox' => $apcontact['sharedinbox']]); - HTTPSignature::setInboxStatus($apcontact['sharedinbox'], false, true); + HTTPSignature::setInboxStatus($apcontact['sharedinbox'], false, true, $apcontact['gsid']); } } } @@ -545,11 +553,11 @@ class APContact { if (!empty($apcontact['inbox'])) { Logger::info('Set inbox status to success', ['inbox' => $apcontact['inbox']]); - HTTPSignature::setInboxStatus($apcontact['inbox'], true); + HTTPSignature::setInboxStatus($apcontact['inbox'], true, false, $apcontact['gsid']); } if (!empty($apcontact['sharedinbox'])) { Logger::info('Set shared inbox status to success', ['sharedinbox' => $apcontact['sharedinbox']]); - HTTPSignature::setInboxStatus($apcontact['sharedinbox'], true, true); + HTTPSignature::setInboxStatus($apcontact['sharedinbox'], true, true, $apcontact['gsid']); } } @@ -558,15 +566,16 @@ class APContact * * @param string $url inbox url * @param boolean $shared Shared Inbox + * @param int $gsid Global server id * @return void */ - private static function unarchiveInbox(string $url, bool $shared) + private static function unarchiveInbox(string $url, bool $shared, int $gsid = null) { if (empty($url)) { return; } - HTTPSignature::setInboxStatus($url, true, $shared); + HTTPSignature::setInboxStatus($url, true, $shared, $gsid); } /** @@ -578,15 +587,20 @@ class APContact */ public static function isRelay(array $apcontact): bool { - if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') { + if (!in_array($apcontact['type'] ?? '', ['Application', 'Group', 'Service'])) { return false; } - if (!empty($apcontact['type']) && $apcontact['type'] == 'Application') { + $path = parse_url($apcontact['url'], PHP_URL_PATH); + if (($apcontact['type'] == 'Group') && !empty($apcontact['followers']) && ($apcontact['nick'] == 'relay') && ($path == '/actor')) { + return true; + } + + if (in_array($apcontact['type'], ['Application', 'Service']) && empty($apcontact['following']) && empty($apcontact['followers'])) { return true; } - if (!empty($apcontact['type']) && in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) { + if (($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay') && in_array($path, ['/actor', '/relay'])) { return true; }