<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Model\GServer;
use Friendica\Model\Profile;
use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Email;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
+use GuzzleHttp\Psr7\Uri;
/**
* This class contain functions for probing URL
/**
* Remove stuff from an URI that doesn't belong there
*
- * @param string $URI
+ * @param string $rawUri
* @return string Cleaned URI
*/
- public static function cleanURI(string $URI)
+ public static function cleanURI(string $rawUri): string
{
// At first remove leading and trailing junk
- $URI = trim($URI, "@#?:/ \t\n\r\0\x0B");
+ $rawUri = trim($rawUri, "@#?:/ \t\n\r\0\x0B");
- $parts = parse_url($URI);
-
- if (empty($parts['scheme'])) {
- return $URI;
+ $uri = new Uri($rawUri);
+ if (!$uri->getScheme()) {
+ return $uri->__toString();
}
// Remove the URL fragment, since these shouldn't be part of any profile URL
- unset($parts['fragment']);
-
- $URI = Network::unparseURL($parts);
+ $uri = $uri->withFragment('');
- return $URI;
+ return $uri->__toString();
}
/**
Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
$xrd = null;
- $curlResult = DI::httpClient()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+ $curlResult = DI::httpClient()->get($ssl_url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody();
}
if (!is_object($xrd) && !empty($url)) {
- $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+ $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isTimeout()) {
Logger::info('Probing timeout', ['url' => $url]);
*/
private static function getHideStatus($url)
{
- $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
+ $curlResult = DI::httpClient()->get($url, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
if (!$curlResult->isSuccess()) {
return false;
}
* Get webfinger data from a given URI
*
* @param string $uri
- * @return array Webfinger array
+ * @return array
+ * @throws HTTPException\InternalServerErrorException
*/
- private static function getWebfingerArray(string $uri)
+ private static function getWebfingerArray(string $uri): array
{
$parts = parse_url($uri);
if (!empty($parts['scheme']) && !empty($parts['host'])) {
$host = $parts['host'];
if (!empty($parts['port'])) {
- $host .= ':'.$parts['port'];
+ $host .= ':' . $parts['port'];
}
$baseurl = $parts['scheme'] . '://' . $host;
$nick = '';
$addr = '';
- $path_parts = explode("/", trim($parts['path'] ?? '', "/"));
+ $path_parts = explode('/', trim($parts['path'] ?? '', '/'));
if (!empty($path_parts)) {
$nick = ltrim(end($path_parts), '@');
- // When the last part of the URI is numeric then it is most likely an ID and not a nick name
- if (!is_numeric($nick)) {
- $addr = $nick."@".$host;
- } else {
- $nick = '';
- }
+ $addr = $nick . '@' . $host;
}
$webfinger = self::getWebfinger($parts['scheme'] . '://' . $host . self::WEBFINGER, 'application/jrd+json', $uri, $addr);
if (empty($webfinger) && empty($lrdd)) {
while (empty($lrdd) && empty($webfinger) && (sizeof($path_parts) > 1)) {
- $host .= "/".array_shift($path_parts);
+ $host .= '/' . array_shift($path_parts);
$baseurl = $parts['scheme'] . '://' . $host;
if (!empty($nick)) {
- $addr = $nick."@".$host;
+ $addr = $nick . '@' . $host;
}
$webfinger = self::getWebfinger($parts['scheme'] . '://' . $host . self::WEBFINGER, 'application/jrd+json', $uri, $addr);
'uri' => $uri,
'network' => $network,
'uid' => $uid,
- 'result' => [],
+ 'result' => null,
];
Hook::callAll('probe_detect', $hookData);
- if ($hookData['result']) {
- if (!is_array($hookData['result'])) {
- return [];
- } else {
- return $hookData['result'];
- }
+ if (isset($hookData['result'])) {
+ return is_array($hookData['result']) ? $hookData['result'] : [];
}
$parts = parse_url($uri);
-
- if (!empty($parts['scheme']) && !empty($parts['host'])) {
- if (in_array($parts['host'], ['twitter.com', 'mobile.twitter.com'])) {
- return self::twitter($uri);
- }
- } elseif (strstr($uri, '@')) {
- // If the URI starts with "mailto:" then jump directly to the mail detection
- if (strpos($uri, 'mailto:') !== false) {
- $uri = str_replace('mailto:', '', $uri);
- return self::mail($uri, $uid);
- }
-
- if ($network == Protocol::MAIL) {
- return self::mail($uri, $uid);
- }
-
- if (Strings::endsWith($uri, '@twitter.com')
- || Strings::endsWith($uri, '@mobile.twitter.com')
- ) {
- return self::twitter($uri);
- }
- } else {
+ if (empty($parts['scheme']) && empty($parts['host']) && !strstr($parts['path'], '@')) {
Logger::info('URI was not detectable', ['uri' => $uri]);
return [];
}
+ // If the URI starts with "mailto:" then jump directly to the mail detection
+ if (strpos($uri, 'mailto:') !== false) {
+ $uri = str_replace('mailto:', '', $uri);
+ return self::mail($uri, $uid);
+ }
+
+ if ($network == Protocol::MAIL) {
+ return self::mail($uri, $uid);
+ }
+
Logger::info('Probing start', ['uri' => $uri]);
if (!empty($ap_profile['addr']) && ($ap_profile['addr'] != $uri)) {
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
- $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
+ $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => [$type]]);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
return [];
return $data;
}
- /**
- * Check for twitter contact
- *
- * @param string $uri
- *
- * @return array twitter data
- */
- private static function twitter($uri)
- {
- if (preg_match('=([^@]+)@(?:mobile\.)?twitter\.com$=i', $uri, $matches)) {
- $nick = $matches[1];
- } elseif (preg_match('=^https?://(?:mobile\.)?twitter\.com/(.+)=i', $uri, $matches)) {
- $nick = $matches[1];
- } else {
- return [];
- }
-
- $data = [];
- $data['url'] = 'https://twitter.com/' . $nick;
- $data['addr'] = $nick . '@twitter.com';
- $data['nick'] = $data['name'] = $nick;
- $data['network'] = Protocol::TWITTER;
- $data['baseurl'] = 'https://twitter.com';
-
- return $data;
- }
-
/**
* Checks HTML page for RSS feed link
*
$data["name"] .= $perspart->text;
}
}
-
- $data["name"] = Strings::escapeTags($data["name"]);
}
}
}
/**
* Fetch the last date that the contact had posted something (publically)
*
- * @param string $data probing result
+ * @param array $data probing result
* @return string last activity
*/
public static function getLastUpdate(array $data)
throw new HTTPException\NotFoundException('User not found.');
}
- $profile = User::getOwnerDataById($uid);
+ $owner = User::getOwnerDataById($uid);
$approfile = ActivityPub\Transmitter::getProfile($uid);
- if (empty($profile['gsid'])) {
- $profile['gsid'] = GServer::getID($approfile['generator']['url']);
+ if (empty($owner['gsid'])) {
+ $owner['gsid'] = GServer::getID($approfile['generator']['url']);
}
$data = [
- 'name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
- 'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
- 'photo' => User::getAvatarUrlForId($uid),
- 'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
- 'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
- 'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
- 'xmpp' => $profile['xmpp'], 'matrix' => $profile['matrix'],
- 'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
- 'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
- 'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'],
+ 'name' => $owner['name'], 'nick' => $owner['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+ 'url' => $owner['url'], 'addr' => $owner['addr'], 'alias' => $owner['alias'],
+ 'photo' => User::getAvatarUrl($owner),
+ 'header' => $owner['header'] ? Contact::getHeaderUrlForId($owner['id'], $owner['updated']) : '',
+ 'account-type' => $owner['contact-type'], 'community' => ($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+ 'keywords' => $owner['keywords'], 'location' => $owner['location'], 'about' => $owner['about'],
+ 'xmpp' => $owner['xmpp'], 'matrix' => $owner['matrix'],
+ 'hide' => !$owner['net-publish'], 'batch' => '', 'notify' => $owner['notify'],
+ 'poll' => $owner['poll'], 'request' => $owner['request'], 'confirm' => $owner['confirm'],
+ 'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $owner['poco'],
'following' => $approfile['following'], 'followers' => $approfile['followers'],
'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
- 'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
- 'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
+ 'pubkey' => $owner['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $owner['gsid'],
+ 'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
];
} catch (Exception $e) {
// Default values for non existing targets
projects / friendica.git / blobdiff