Issue 9657: Check the age of an item

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

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 89da59ba26012911842589abe1e8768a4130a63a..5b7bb02a3ec9252ec1082355da352c18a04ad929 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -314,14 +314,15 @@ class HTTPSignature
         *
         * @param string  $url     The URL of the inbox
         * @param boolean $success Transmission status
+        * @param boolean $shared  The inbox is a shared inbox
         */
-       static private function setInboxStatus($url, $success)
+       static public function setInboxStatus($url, $success, $shared = false)
        {
                $now = DateTimeFormat::utcNow();
 
                $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
                if (!DBA::isResult($status)) {
-                       DBA::insert('inbox-status', ['url' => $url, 'created' => $now]);
+                       DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared]);
                        $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
                }
 
@@ -403,8 +404,6 @@ class HTTPSignature
         * @param array   $opts    (optional parameters) assoziative array with:
         *                         'accept_content' => supply Accept: header with 'accept_content' as the value
         *                         'timeout' => int Timeout in seconds, default system config value or 60 seconds
-        *                         'http_auth' => username:password
-        *                         'novalidate' => do not validate SSL certs, default is to validate using our CA list
         *                         'nobody' => only return the header
         *                         'cookiejar' => path to cookie jar file
         *
@@ -413,36 +412,47 @@ class HTTPSignature
         */
        public static function fetchRaw($request, $uid = 0, $binary = false, $opts = [])
        {
+               $header = [];
+
                if (!empty($uid)) {
                        $owner = User::getOwnerDataById($uid);
                        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);
 
-                       $headers = ['Date: ' . $date, 'Host: ' . $host];
+                       $header = ['Date: ' . $date, 'Host: ' . $host];
 
                        $signed_data = "(request-target): get " . $path . "\ndate: ". $date . "\nhost: " . $host;
 
                        $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 = [];
+                       $header[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
                }
 
                if (!empty($opts['accept_content'])) {
-                       $headers[] = 'Accept: ' . $opts['accept_content'];
+                       $header[] = 'Accept: ' . $opts['accept_content'];
                }
 
                $curl_opts = $opts;
-               $curl_opts['header'] = $headers;
+               $curl_opts['header'] = $header;
 
-               $curlResult = DI::httpRequest()->get($request, false, $curl_opts);
+               if (!empty($opts['nobody'])) {
+                       $curlResult = DI::httpRequest()->head($request, $curl_opts);
+               } else {
+                       $curlResult = DI::httpRequest()->get($request, $curl_opts);
+               }
                $return_code = $curlResult->getReturnCode();
 
                Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG);
@@ -477,7 +487,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) {