Merge pull request #9186 from annando/valid-posts

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

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index bbd5cd9b1585edcc46f486f00cabefd3bd8a4f71..cdee48bfc02683bb5e67f31cfc1ba9e26240bec6 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -420,21 +420,26 @@ class HTTPSignature
                        if (!$owner) {
                                return;
                        }
+               } else {
+                       $owner = User::getSystemAccount();
+                       if (!$owner) {
+                               return;
+                       }
+               }
 
-                       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);
+               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 . '"';
-                       }
+                       $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
                }
 
                if (!empty($opts['accept_content'])) {
@@ -479,7 +484,7 @@ class HTTPSignature
                }
 
                $headers = [];
-               $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . $http_headers['REQUEST_URI'];
+               $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH);
 
                // First take every header
                foreach ($http_headers as $k => $v) {