Don't let the tests fail. The test user doesn't have a private key

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

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index d151516beae7a9bed098f766c43dd1628ced6330..bbd5cd9b1585edcc46f486f00cabefd3bd8a4f71 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -21,11 +21,11 @@
 
 namespace Friendica\Util;
 
-use Friendica\Database\DBA;
 use Friendica\Core\Logger;
+use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\User;
 use Friendica\Model\APContact;
+use Friendica\Model\User;
 
 /**
  * Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -297,7 +297,7 @@ class HTTPSignature
 
                $headers[] = 'Content-Type: application/activity+json';
 
-               $postResult = Network::post($target, $content, $headers);
+               $postResult = DI::httpRequest()->post($target, $content, $headers);
                $return_code = $postResult->getReturnCode();
 
                Logger::log('Transmit to ' . $target . ' returned ' . $return_code, Logger::DEBUG);
@@ -413,26 +413,28 @@ class HTTPSignature
         */
        public static function fetchRaw($request, $uid = 0, $binary = false, $opts = [])
        {
+               $headers = [];
+
                if (!empty($uid)) {
                        $owner = User::getOwnerDataById($uid);
                        if (!$owner) {
                                return;
                        }
 
-                       // Header data that is about to be signed.
-                       $host = parse_url($request, PHP_URL_HOST);
-                       $path = parse_url($request, PHP_URL_PATH);
-                       $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP);
+                       if (!empty($owner['uprvkey'])) {
+                               // Header data that is about to be signed.
+                               $host = parse_url($request, PHP_URL_HOST);
+                               $path = parse_url($request, PHP_URL_PATH);
+                               $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP);
 
-                       $headers = ['Date: ' . $date, 'Host: ' . $host];
+                               $headers = ['Date: ' . $date, 'Host: ' . $host];
 
-                       $signed_data = "(request-target): get " . $path . "\ndate: ". $date . "\nhost: " . $host;
+                               $signed_data = "(request-target): get " . $path . "\ndate: ". $date . "\nhost: " . $host;
 
-                       $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
+                               $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
 
-                       $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
-               } else {
-                       $headers = [];
+                               $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
+                       }
                }
 
                if (!empty($opts['accept_content'])) {
@@ -442,7 +444,7 @@ class HTTPSignature
                $curl_opts = $opts;
                $curl_opts['header'] = $headers;
 
-               $curlResult = Network::curl($request, false, $curl_opts);
+               $curlResult = DI::httpRequest()->get($request, false, $curl_opts);
                $return_code = $curlResult->getReturnCode();
 
                Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG);