Issue 13221: Diaspora posts are now stored correctly

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 92e049ce39087f0b5a5c51d087545c1f124e690c..2b5cc3cff7d02a7cdcaa0209d14813ca37524cde 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -63,7 +63,7 @@ class Probe
        private static $baseurl;
 
        /**
-        * @var boolean Whether a timeout has occured
+        * @var boolean Whether a timeout has occurred
         */
        private static $isTimeout;
 
@@ -120,9 +120,13 @@ class Probe
 
                $numeric_fields = ['gsid', 'hide', 'account-type', 'manually-approve'];
 
-               if (!empty($data['photo']) && !Network::isValidHttpUrl($data['photo'])) {
-                       Logger::info('Invalid URL for photo', ['url' => $data['url'], 'photo' => $data['photo']]);
-                       unset($data['photo']);
+               if (!empty($data['photo'])) {
+                       $data['photo'] = Network::addBasePath($data['photo'], $data['url']);
+
+                       if (!Network::isValidHttpUrl($data['photo'])) {
+                               Logger::warning('Invalid URL for photo', ['url' => $data['url'], 'photo' => $data['photo']]);
+                               unset($data['photo']);
+                       }
                }
 
                $newdata = [];
@@ -174,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);
 
@@ -337,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
@@ -765,7 +768,7 @@ class Probe
                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.
+                       // 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;
@@ -948,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 [];
@@ -1169,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);
@@ -1177,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]);
 
@@ -1619,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'];
@@ -1684,11 +1696,8 @@ class Probe
                }
                if ($avatar) {
                        foreach ($avatar->attributes as $attribute) {
-                               if ($attribute->name == 'src') {
-                                       $data['photo'] = trim($attribute->value);
-                                       if (!empty($data['photo']) && !parse_url($data['photo'], PHP_URL_SCHEME) && !parse_url($data['photo'], PHP_URL_HOST)) {
-                                               $data['photo'] = $baseurl . $data['photo'];
-                                       }
+                               if (($attribute->name == 'src') && !empty($attribute->value)) {
+                                       $data['photo'] = Network::addBasePath($attribute->value, $baseurl);
                                }
                        }
                }
@@ -2279,7 +2288,7 @@ class Probe
                                ]
                        ];
                } 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