Merge remote-tracking branch 'upstream/develop' into user-contact

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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 4cacfedf408f81d8f2b5f0f0d019e8ffc60d37d9..4aa50b4be5a71b91438ab7025192a106314e6349 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -101,7 +101,7 @@ class Probe
                        if (isset($data[$field])) {
                                if (in_array($field, $numeric_fields)) {
                                        $newdata[$field] = (int)$data[$field];
-                               } else {        
+                               } else {
                                        $newdata[$field] = $data[$field];
                                }
                        } elseif (!in_array($field, $numeric_fields)) {
@@ -170,7 +170,7 @@ class Probe
                Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
                $xrd = null;
 
-               $curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, '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();
@@ -187,7 +187,7 @@ class Probe
                }
 
                if (!is_object($xrd) && !empty($url)) {
-                       $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, '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]);
@@ -231,6 +231,11 @@ class Probe
                        }
                }
 
+               if (Network::isUrlBlocked($host_url)) {
+                       Logger::info('Domain is blocked', ['url' => $host]);
+                       return [];
+               }
+
                self::$baseurl = $host_url;
 
                Logger::info('Probing successful', ['host' => $host]);
@@ -424,7 +429,7 @@ class Probe
         */
        private static function getHideStatus($url)
        {
-               $curlResult = DI::httpRequest()->get($url, ['content_length' => 1000000]);
+               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -625,6 +630,11 @@ class Probe
         */
        private static function getWebfinger(string $template, string $type, string $uri, string $addr)
        {
+               if (Network::isUrlBlocked($template)) {
+                       Logger::info('Domain is blocked', ['url' => $template]);
+                       return [];
+               }
+
                // First try the address because this is the primary purpose of webfinger
                if (!empty($addr)) {
                        $detected = $addr;
@@ -843,7 +853,7 @@ class Probe
 
        public static function pollZot($url, $data)
        {
-               $curlResult = DI::httpRequest()->get($url);
+               $curlResult = DI::httpClient()->get($url);
                if ($curlResult->isTimeout()) {
                        return $data;
                }
@@ -940,7 +950,7 @@ class Probe
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-               $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1009,7 +1019,7 @@ class Probe
         */
        private static function pollNoscrape($noscrape_url, $data)
        {
-               $curlResult = DI::httpRequest()->get($noscrape_url);
+               $curlResult = DI::httpClient()->get($noscrape_url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return $data;
@@ -1275,7 +1285,7 @@ class Probe
         */
        private static function pollHcard($hcard_url, $data, $dfrn = false)
        {
-               $curlResult = DI::httpRequest()->get($hcard_url);
+               $curlResult = DI::httpClient()->get($hcard_url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1536,7 +1546,7 @@ class Probe
                                                        $pubkey = substr($pubkey, 5);
                                                }
                                        } elseif (Strings::normaliseLink($pubkey) == 'http://') {
-                                               $curlResult = DI::httpRequest()->get($pubkey);
+                                               $curlResult = DI::httpClient()->get($pubkey);
                                                if ($curlResult->isTimeout()) {
                                                        self::$istimeout = true;
                                                        return $short ? false : [];
@@ -1570,7 +1580,7 @@ class Probe
                }
 
                // Fetch all additional data from the feed
-               $curlResult = DI::httpRequest()->get($data["poll"]);
+               $curlResult = DI::httpClient()->get($data["poll"]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1622,7 +1632,7 @@ class Probe
         */
        private static function pumpioProfileData($profile_link)
        {
-               $curlResult = DI::httpRequest()->get($profile_link);
+               $curlResult = DI::httpClient()->get($profile_link);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return [];
                }
@@ -1862,7 +1872,7 @@ class Probe
         */
        private static function feed($url, $probe = true)
        {
-               $curlResult = DI::httpRequest()->get($url);
+               $curlResult = DI::httpClient()->get($url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -2086,7 +2096,7 @@ class Probe
                        return '';
                }
 
-               $curlResult = DI::httpRequest()->get($gserver['noscrape'] . '/' . $data['nick']);
+               $curlResult = DI::httpClient()->get($gserver['noscrape'] . '/' . $data['nick']);
 
                if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
                        $noscrape = json_decode($curlResult->getBody(), true);
@@ -2161,7 +2171,7 @@ class Probe
        private static function updateFromFeed(array $data)
        {
                // Search for the newest entry in the feed
-               $curlResult = DI::httpRequest()->get($data['poll']);
+               $curlResult = DI::httpClient()->get($data['poll']);
                if (!$curlResult->isSuccess() || !$curlResult->getBody()) {
                        return '';
                }
@@ -2229,11 +2239,11 @@ class Probe
                        $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']),
+                               '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'], 
+                               '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'],