Merge pull request #11519 from MrPetovan/task/11511-console-domain-move

[friendica.git] / src / Protocol / Salmon.php

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 169a4d0cbd8ec541fd39518d8d1534e84a887548..9724f82df74ab6c6dac984eeb0e0e4bdb02431d2 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ namespace Friendica\Protocol;
 
 use Friendica\Core\Logger;
 use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
 use Friendica\Util\Strings;
@@ -46,7 +47,7 @@ class Salmon
        {
                $ret = [];
 
-               Logger::log('Fetching salmon key for '.$uri);
+               Logger::info('Fetching salmon key for '.$uri);
 
                $arr = Probe::lrdd($uri);
 
@@ -72,7 +73,8 @@ class Salmon
                                                $ret[$x] = substr($ret[$x], 5);
                                        }
                                } elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
-                                       $ret[$x] = DI::httpRequest()->fetch($ret[$x]);
+                                       $ret[$x] = DI::httpClient()->fetch($ret[$x], HttpClientAccept::MAGIC_KEY);
+                                       Logger::debug('Fetched public key', ['url' => $ret[$x]]);
                                }
                        }
                }
@@ -116,12 +118,12 @@ class Salmon
                }
 
                if (!$owner['sprvkey']) {
-                       Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+                       Logger::notice(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
                        $owner['name'], $owner['uid']));
                        return;
                }
 
-               Logger::log('slapper called for '.$url.'. Data: ' . $slap);
+               Logger::info('slapper called for '.$url.'. Data: ' . $slap);
 
                // create a magic envelope
 
@@ -155,9 +157,9 @@ class Salmon
                $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                // slap them
-               $postResult = DI::httpRequest()->post($url, $salmon, [
-                       'Content-type: application/magic-envelope+xml',
-                       'Content-length: ' . strlen($salmon)
+               $postResult = DI::httpClient()->post($url, $salmon, [
+                       'Content-type' => 'application/magic-envelope+xml',
+                       'Content-length' => strlen($salmon),
                ]);
 
                $return_code = $postResult->getReturnCode();
@@ -165,7 +167,7 @@ class Salmon
                // check for success, e.g. 2xx
 
                if ($return_code > 299) {
-                       Logger::log('GNU Social salmon failed. Falling back to compliant mode');
+                       Logger::notice('GNU Social salmon failed. Falling back to compliant mode');
 
                        // Now try the compliant mode that normally isn't used for GNU Social
                        $xmldata = ["me:env" => ["me:data" => $data,
@@ -180,15 +182,15 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpRequest()->post($url, $salmon, [
-                               'Content-type: application/magic-envelope+xml',
-                               'Content-length: ' . strlen($salmon)
+                       $postResult = DI::httpClient()->post($url, $salmon, [
+                               'Content-type' => 'application/magic-envelope+xml',
+                               'Content-length' => strlen($salmon),
                        ]);
                        $return_code = $postResult->getReturnCode();
                }
 
                if ($return_code > 299) {
-                       Logger::log('compliant salmon failed. Falling back to old status.net');
+                       Logger::notice('compliant salmon failed. Falling back to old status.net');
 
                        // Last try. This will most likely fail as well.
                        $xmldata = ["me:env" => ["me:data" => $data,
@@ -203,19 +205,19 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpRequest()->post($url, $salmon, [
-                               'Content-type: application/magic-envelope+xml',
-                               'Content-length: ' . strlen($salmon)]);
+                       $postResult = DI::httpClient()->post($url, $salmon, [
+                               'Content-type' => 'application/magic-envelope+xml',
+                               'Content-length' => strlen($salmon)]);
                        $return_code = $postResult->getReturnCode();
                }
 
-               Logger::log('slapper for '.$url.' returned ' . $return_code);
+               Logger::info('slapper for '.$url.' returned ' . $return_code);
 
                if (! $return_code) {
                        return -1;
                }
 
-               if (($return_code == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
+               if (($return_code == 503) && $postResult->inHeader('retry-after')) {
                        return -1;
                }