Standards

[friendica.git] / src / Util / HTTPSignature.php

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index eab778b82027f92d3d30dacfb4895cecea9e77e4..3e22820e5c4e96349035b8561c8773e147d15285 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,8 +28,7 @@ use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
-use Friendica\Network\CurlResult;
-use Friendica\Network\IHTTPResult;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 
 /**
  * Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -65,7 +64,7 @@ class HTTPSignature
 
                // Decide if $data arrived via controller submission or curl.
                $headers = [];
-               $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
+               $headers['(request-target)'] = strtolower(DI::args()->getMethod()).' '.$_SERVER['REQUEST_URI'];
 
                foreach ($_SERVER as $k => $v) {
                        if (strpos($k, 'HTTP_') === 0) {
@@ -79,7 +78,7 @@ class HTTPSignature
                $sig_block = self::parseSigheader($headers['authorization']);
 
                if (!$sig_block) {
-                       Logger::log('no signature provided.');
+                       Logger::notice('no signature provided.');
                        return $result;
                }
 
@@ -109,7 +108,7 @@ class HTTPSignature
                        $key = $key($sig_block['keyId']);
                }
 
-               Logger::log('Got keyID ' . $sig_block['keyId'], Logger::DEBUG);
+               Logger::info('Got keyID ' . $sig_block['keyId']);
 
                if (!$key) {
                        return $result;
@@ -117,7 +116,7 @@ class HTTPSignature
 
                $x = Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm);
 
-               Logger::log('verified: ' . $x, Logger::DEBUG);
+               Logger::info('verified: ' . $x);
 
                if (!$x) {
                        return $result;
@@ -304,10 +303,10 @@ class HTTPSignature
 
                $headers['Content-Type'] = 'application/activity+json';
 
-               $postResult = DI::httpRequest()->post($target, $content, $headers);
+               $postResult = DI::httpClient()->post($target, $content, $headers);
                $return_code = $postResult->getReturnCode();
 
-               Logger::log('Transmit to ' . $target . ' returned ' . $return_code, Logger::DEBUG);
+               Logger::info('Transmit to ' . $target . ' returned ' . $return_code);
 
                $success = ($return_code >= 200) && ($return_code <= 299);
 
@@ -413,10 +412,10 @@ class HTTPSignature
         *                         'nobody' => only return the header
         *                         'cookiejar' => path to cookie jar file
         *
-        * @return IHTTPResult CurlResult
+        * @return \Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses CurlResult
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json', 'application/ld+json']])
+       public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"']])
        {
                $header = [];
 
@@ -448,17 +447,17 @@ class HTTPSignature
                        $header['Signature'] = 'keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
                }
 
-               $curl_opts = $opts;
-               $curl_opts['header'] = $header;
+               $curl_opts                             = $opts;
+               $curl_opts[HttpClientOptions::HEADERS] = $header;
 
                if (!empty($opts['nobody'])) {
-                       $curlResult = DI::httpRequest()->head($request, $curl_opts);
+                       $curlResult = DI::httpClient()->head($request, $curl_opts);
                } else {
-                       $curlResult = DI::httpRequest()->get($request, $curl_opts);
+                       $curlResult = DI::httpClient()->get($request, $curl_opts);
                }
                $return_code = $curlResult->getReturnCode();
 
-               Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG);
+               Logger::info('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code);
 
                return $curlResult;
        }
@@ -475,7 +474,7 @@ class HTTPSignature
        public static function getSigner($content, $http_headers)
        {
                if (empty($http_headers['HTTP_SIGNATURE'])) {
-                       Logger::info('No HTTP_SIGNATURE header');
+                       Logger::debug('No HTTP_SIGNATURE header');
                        return false;
                }
 
@@ -492,7 +491,7 @@ class HTTPSignature
                }
 
                $headers = [];
-               $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH);
+               $headers['(request-target)'] = strtolower(DI::args()->getMethod()) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH);
 
                // First take every header
                foreach ($http_headers as $k => $v) {
@@ -603,7 +602,7 @@ class HTTPSignature
                if (in_array('date', $sig_block['headers'])) {
                        $diff = abs(strtotime($headers['date']) - time());
                        if ($diff > 300) {
-                               Logger::log("Header date '" . $headers['date'] . "' is with " . $diff . " seconds out of the 300 second frame. The signature is invalid.");
+                               Logger::notice("Header date '" . $headers['date'] . "' is with " . $diff . " seconds out of the 300 second frame. The signature is invalid.");
                                return false;
                        }
                        $hasGoodSignedContent = true;