<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
*/
private static function rearrangeData($data)
{
- $fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "account-type",
- "community", "keywords", "location", "about", "hide",
+ $fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "header",
+ "account-type", "community", "keywords", "location", "about", "hide",
"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
"following", "followers", "inbox", "outbox", "sharedinbox",
"priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
$xrd = null;
- $curlResult = DI::httpRequest()->get($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, '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::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isTimeout()) {
Logger::info('Probing timeout', ['url' => $url]);
* @return string profile link
* @throws HTTPException\InternalServerErrorException
*/
- public static function webfingerDfrn($webbie, &$hcard_url)
+ public static function webfingerDfrn(string $webbie, string &$hcard_url)
{
$profile_link = '';
public static function uri($uri, $network = '', $uid = -1)
{
// Local profiles aren't probed via network
- if (empty($network) && strpos($uri, DI::baseUrl()->getHostname())) {
+ if (empty($network) && Contact::isLocal($uri)) {
$data = self::localProbe($uri);
if (!empty($data)) {
return $data;
*/
private static function getHideStatus($url)
{
- $curlResult = DI::httpRequest()->get($url, false, ['content_length' => 1000000]);
+ $curlResult = DI::httpRequest()->get($url);
if (!$curlResult->isSuccess()) {
return false;
}
+ // If the file is too large then exit
+ if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
+ return false;
+ }
+
// If it isn't a HTML file then exit
- if (!in_array('html', $curlResult->getContentType())) {
+ if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
return false;
}
$body = $curlResult->getBody();
+ if (empty($body)) {
+ return false;
+ }
$doc = new DOMDocument();
@$doc->loadHTML($body);
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
- $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+ $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
return [];
$curlResult = DI::httpRequest()->get($noscrape_url);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
- return [];
+ return $data;
}
$content = $curlResult->getBody();
if (!$content) {
Logger::info('Empty body', ['url' => $noscrape_url]);
- return [];
+ return $data;
}
$json = json_decode($content, true);
if (!is_array($json)) {
Logger::info('No json data', ['url' => $noscrape_url]);
- return [];
+ return $data;
}
if (!empty($json["fn"])) {
return [];
}
$content = $curlResult->getBody();
- if (!$content) {
+ if (empty($content)) {
return [];
}
private static function pumpioProfileData($profile_link)
{
$curlResult = DI::httpRequest()->get($profile_link);
- if (!$curlResult->isSuccess()) {
+ if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
return [];
}
*/
public static function getFeedLink(string $url, string $body)
{
+ if (empty($body)) {
+ return '';
+ }
+
$doc = new DOMDocument();
if (!@$doc->loadHTML($body)) {
return false;
$hrefParts = parse_url($href);
- // Root path case (/path) including relative scheme case (//host/path)
- if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
- $path = $hrefParts['path'];
- } else {
- $path = $path . '/' . $hrefParts['path'];
-
- // Resolve arbitrary relative path
- // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
- $parts = array_filter(explode('/', $path), 'strlen');
- $absolutes = array();
- foreach ($parts as $part) {
- if ('.' == $part) continue;
- if ('..' == $part) {
- array_pop($absolutes);
- } else {
- $absolutes[] = $part;
+ if (!empty($hrefParts['path'])) {
+ // Root path case (/path) including relative scheme case (//host/path)
+ if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
+ $path = $hrefParts['path'];
+ } else {
+ $path = $path . '/' . $hrefParts['path'];
+
+ // Resolve arbitrary relative path
+ // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
+ $parts = array_filter(explode('/', $path), 'strlen');
+ $absolutes = array();
+ foreach ($parts as $part) {
+ if ('.' == $part) continue;
+ if ('..' == $part) {
+ array_pop($absolutes);
+ } else {
+ $absolutes[] = $part;
+ }
}
- }
- $path = '/' . implode('/', $absolutes);
+ $path = '/' . implode('/', $absolutes);
+ }
}
// Relative scheme case (//host/path)
*/
private static function localProbe(string $url)
{
- $uid = User::getIdForURL($url);
- if (empty($uid)) {
- return [];
- }
-
- $profile = User::getOwnerDataById($uid);
- if (empty($profile)) {
- return [];
- }
-
- $approfile = ActivityPub\Transmitter::getProfile($uid);
- if (empty($approfile)) {
- return [];
- }
-
- if (empty($profile['gsid'])) {
- $profile['gsid'] = GServer::getID($approfile['generator']['url']);
+ if ($uid = User::getIdForURL($url)) {
+ $profile = User::getOwnerDataById($uid);
+ $approfile = ActivityPub\Transmitter::getProfile($uid);
+
+ if (empty($profile['gsid'])) {
+ $profile['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' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']),
+ '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'],
+ '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'],
+ '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])];
+ } else {
+ // Default values for non existing targets
+ $data = ['name' => $url, 'nick' => $url, 'url' => $url, 'network' => Protocol::PHANTOM,
+ 'photo' => DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO];
}
-
- $data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
- 'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
- 'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
- 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
- 'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
- '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'],
- '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])];
return self::rearrangeData($data);
}
}
projects / friendica.git / blobdiff