Merge pull request #12736 from MrPetovan/bug/12733-webfinger-apcontact

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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index e1bedf5e5358e1fa51bf9e26aa2d6d4c455a7d9b..92e049ce39087f0b5a5c51d087545c1f124e690c 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -524,7 +524,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);
 
@@ -766,7 +766,7 @@ class Probe
                        $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).
+                       // Additionally, it is overwritten when the nickname doesn't make sense (contains spaces).
                        if ((empty($result['nick']) || (strstr($result['nick'], ' '))) && ($nick != '')) {
                                $result['nick'] = $nick;
                        }
@@ -1861,11 +1861,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);