X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FNetwork%2FProbe.php;h=2b5cc3cff7d02a7cdcaa0209d14813ca37524cde;hb=cab469621d173015ade7846344f5051b600d640d;hp=5a8f75e2d8cc30820cf63b3b40073c40c6692787;hpb=46660c94628bdbad2ce9b36368bb55df120497d3;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 5a8f75e2d8..2b5cc3cff7 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -1,6 +1,6 @@ $data['url'], 'photo' => $data['photo']]); + unset($data['photo']); + } + } + $newdata = []; foreach ($fields as $field) { if (isset($data[$field])) { @@ -139,8 +148,17 @@ class Probe foreach ([Protocol::DIASPORA, Protocol::OSTATUS] as $network) { if (!empty($data['networks'][$network])) { $data['networks'][$network]['subscribe'] = $newdata['subscribe'] ?? ''; - $data['networks'][$network]['baseurl'] = $newdata['baseurl'] ?? ''; - $data['networks'][$network]['gsid'] = $newdata['gsid'] ?? 0; + if (empty($data['networks'][$network]['baseurl'])) { + $data['networks'][$network]['baseurl'] = $newdata['baseurl'] ?? ''; + } else { + $newdata['baseurl'] = $data['networks'][$network]['baseurl']; + } + if (!empty($newdata['baseurl'])) { + $newdata['gsid'] = $data['networks'][$network]['gsid'] = GServer::getID($newdata['baseurl']); + } else { + $newdata['gsid'] = $data['networks'][$network]['gsid'] = null; + } + $newdata['networks'][$network] = self::rearrangeData($data['networks'][$network]); unset($newdata['networks'][$network]['networks']); } @@ -160,7 +178,7 @@ class Probe */ private static function ownHost(string $host): bool { - $own_host = DI::baseUrl()->getHostname(); + $own_host = DI::baseUrl()->getHost(); $parts = parse_url($host); @@ -323,7 +341,6 @@ class Probe * @param string $uri Address that should be probed * @param string $network Test for this specific network * @param integer $uid User ID for the probe (only used for mails) - * @param boolean $cache Use cached values? * * @return array uri data * @throws HTTPException\InternalServerErrorException @@ -510,7 +527,7 @@ class Probe * @return array Webfinger data * @throws HTTPException\InternalServerErrorException */ - private static function getWebfingerArray(string $uri): array + public static function getWebfingerArray(string $uri): array { $parts = parse_url($uri); @@ -746,13 +763,13 @@ class Probe $result = self::zot($webfinger, $result, $baseurl); } if ((!$result && ($network == '')) || ($network == Protocol::PUMPIO)) { - $result = self::pumpio($webfinger, $addr); + $result = self::pumpio($webfinger, $addr, $baseurl); } if (empty($result['network']) && empty($ap_profile['network']) || ($network == Protocol::FEED)) { $result = self::feed($uri); } else { - // We overwrite the detected nick with our try if the previois routines hadn't detected it. - // Additionally it is overwritten when the nickname doesn't make sense (contains spaces). + // We overwrite the detected nick with our try if the previous routines hadn't detected it. + // Additionally, it is overwritten when the nickname doesn't make sense (contains spaces). if ((empty($result['nick']) || (strstr($result['nick'], ' '))) && ($nick != '')) { $result['nick'] = $nick; } @@ -934,9 +951,17 @@ class Probe */ public static function webfinger(string $url, string $type): array { - $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); + try { + $curlResult = DI::httpClient()->get( + $url, + $type, + [HttpClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout', 20)] + ); + } catch (\Throwable $e) { + Logger::notice($e->getMessage(), ['url' => $url, 'type' => $type, 'class' => get_class($e)]); + return []; + } - $curlResult = DI::httpClient()->get($url, $type, [HttpClientOptions::TIMEOUT => $xrd_timeout]); if ($curlResult->isTimeout()) { self::$isTimeout = true; return []; @@ -1155,7 +1180,6 @@ class Probe $data = self::pollHcard($profile_link, $data, true); } - $prof_data = []; if (empty($data['addr']) || empty($data['nick'])) { $probe_data = self::uri($profile_link); @@ -1163,15 +1187,17 @@ class Probe $data['nick'] = ($data['nick'] ?? '') ?: $probe_data['nick']; } - $prof_data['addr'] = $data['addr']; - $prof_data['nick'] = $data['nick']; - $prof_data['dfrn-request'] = $data['request'] ?? null; - $prof_data['dfrn-confirm'] = $data['confirm'] ?? null; - $prof_data['dfrn-notify'] = $data['notify'] ?? null; - $prof_data['dfrn-poll'] = $data['poll'] ?? null; - $prof_data['photo'] = $data['photo'] ?? null; - $prof_data['fn'] = $data['name'] ?? null; - $prof_data['key'] = $data['pubkey'] ?? null; + $prof_data = [ + 'addr' => $data['addr'], + 'nick' => $data['nick'], + 'dfrn-request' => $data['request'] ?? null, + 'dfrn-confirm' => $data['confirm'] ?? null, + 'dfrn-notify' => $data['notify'] ?? null, + 'dfrn-poll' => $data['poll'] ?? null, + 'photo' => $data['photo'] ?? null, + 'fn' => $data['name'] ?? null, + 'key' => $data['pubkey'] ?? null, + ]; Logger::debug('Result', ['link' => $profile_link, 'data' => $prof_data]); @@ -1605,7 +1631,7 @@ class Probe if (!empty($feed_data['header']['author-about'])) { $data['about'] = $feed_data['header']['author-about']; } - // OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl) + // OStatus has serious issues when the url doesn't fit (ssl vs. non ssl) // So we take the value that we just fetched, although the other one worked as well if (!empty($feed_data['header']['author-link'])) { $data['url'] = $feed_data['header']['author-link']; @@ -1626,7 +1652,7 @@ class Probe * * @return array Profile data */ - private static function pumpioProfileData(string $profile_link): array + private static function pumpioProfileData(string $profile_link, string $baseurl): array { $curlResult = DI::httpClient()->get($profile_link, HttpClientAccept::HTML); if (!$curlResult->isSuccess() || empty($curlResult->getBody())) { @@ -1670,8 +1696,8 @@ class Probe } if ($avatar) { foreach ($avatar->attributes as $attribute) { - if ($attribute->name == 'src') { - $data['photo'] = trim($attribute->value); + if (($attribute->name == 'src') && !empty($attribute->value)) { + $data['photo'] = Network::addBasePath($attribute->value, $baseurl); } } } @@ -1687,7 +1713,7 @@ class Probe * * @return array pump.io data */ - private static function pumpio(array $webfinger, string $addr): array + private static function pumpio(array $webfinger, string $addr, string $baseurl): array { $data = []; // The array is reversed to take into account the order of preference for same-rel links @@ -1719,7 +1745,7 @@ class Probe return []; } - $profile_data = self::pumpioProfileData($data['url']); + $profile_data = self::pumpioProfileData($data['url'], $baseurl); if (!$profile_data) { return []; @@ -1844,11 +1870,18 @@ class Probe */ private static function feed(string $url, bool $probe = true): array { - $curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML); + try { + $curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML); + } catch(\Throwable $e) { + DI::logger()->info('Error requesting feed URL', ['url' => $url, 'exception' => $e]); + return []; + } + if ($curlResult->isTimeout()) { self::$isTimeout = true; return []; } + $feed = $curlResult->getBody(); $feed_data = Feed::import($feed); @@ -2211,7 +2244,7 @@ class Probe $approfile = ActivityPub\Transmitter::getProfile($uid); $split_name = Diaspora::splitName($owner['name']); - + if (empty($owner['gsid'])) { $owner['gsid'] = GServer::getID($approfile['generator']['url']); } @@ -2248,14 +2281,14 @@ class Probe 'batch' => $approfile['generator']['url'] . '/receive/public', 'notify' => $owner['notify'], 'poll' => $owner['poll'], - 'poco' => $owner['poco'], + 'poco' => $owner['poco'], 'network' => Protocol::DIASPORA, 'pubkey' => $owner['upubkey'], ] ] ]; } catch (Exception $e) { - // Default values for non existing targets + // Default values for nonexistent targets $data = [ 'name' => $url, 'nick' => $url, 'url' => $url, 'network' => Protocol::PHANTOM, 'photo' => DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO