Add the mentions

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

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 58af224243e5384373e9840717ba796cf4ca5ecb..68f6cb1dd777d1f6ffcfa20aad83580efef62393 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,9 +28,7 @@ use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClient\Response\CurlResult;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 
 /**
  * Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -66,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) {
@@ -417,7 +415,7 @@ class HTTPSignature
         * @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 = [];
 
@@ -493,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) {
@@ -511,6 +509,15 @@ class HTTPSignature
 
                $sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']);
 
+               // Add fields from the signature block to the header. See issue 8845
+               if (!empty($sig_block['created']) && empty($headers['(created)'])) {
+                       $headers['(created)'] = $sig_block['created'];
+               }
+
+               if (!empty($sig_block['expires']) && empty($headers['(expires)'])) {
+                       $headers['(expires)'] = $sig_block['expires'];
+               }
+
                if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) {
                        Logger::info('No headers or keyId');
                        return false;
@@ -520,6 +527,8 @@ class HTTPSignature
                foreach ($sig_block['headers'] as $h) {
                        if (array_key_exists($h, $headers)) {
                                $signed_data .= $h . ': ' . $headers[$h] . "\n";
+                       } else {
+                               Logger::info('Requested header field not found', ['field' => $h, 'header' => $headers]);
                        }
                }
                $signed_data = rtrim($signed_data, "\n");
@@ -574,7 +583,7 @@ class HTTPSignature
                }
 
                if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
-                       Logger::info('Verification failed');
+                       Logger::info('Verification failed', ['signed_data' => $signed_data, 'algorithm' => $algorithm, 'header' => $sig_block['headers'], 'http_headers' => $http_headers]);
                        return false;
                }
 
@@ -600,13 +609,36 @@ class HTTPSignature
                        $hasGoodSignedContent = true;
                }
 
+               if (in_array('date', $sig_block['headers']) && !empty($headers['date'])) {
+                       $created = strtotime($headers['date']);
+               } elseif (in_array('(created)', $sig_block['headers']) && !empty($sig_block['created'])) {
+                       $created = $sig_block['created'];
+               } else {
+                       $created = 0;
+               }
+
+               if (in_array('(expires)', $sig_block['headers']) && !empty($sig_block['expires'])) {
+                       $expired = min($sig_block['expires'], $created + 300);
+               } else {
+                       $expired = $created + 300;
+               }
+
                //  Check if the signed date field is in an acceptable range
-               if (in_array('date', $sig_block['headers'])) {
-                       $diff = abs(strtotime($headers['date']) - time());
-                       if ($diff > 300) {
-                               Logger::notice("Header date '" . $headers['date'] . "' is with " . $diff . " seconds out of the 300 second frame. The signature is invalid.");
+               if (!empty($created)) {
+                       $current = time();
+
+                       // Calculate with a grace period of 60 seconds to avoid slight time differences between the servers
+                       if (($created - 60) > $current) {
+                               Logger::notice('Signature created in the future', ['created' => date(DateTimeFormat::MYSQL, $created), 'expired' => date(DateTimeFormat::MYSQL, $expired), 'current' => date(DateTimeFormat::MYSQL, $current)]);
                                return false;
                        }
+
+                       if ($current > $expired) {
+                               Logger::notice('Signature expired', ['created' => date(DateTimeFormat::MYSQL, $created), 'expired' => date(DateTimeFormat::MYSQL, $expired), 'current' => date(DateTimeFormat::MYSQL, $current)]);
+                               return false;
+                       }
+
+                       Logger::debug('Valid creation date', ['created' => date(DateTimeFormat::MYSQL, $created), 'expired' => date(DateTimeFormat::MYSQL, $expired), 'current' => date(DateTimeFormat::MYSQL, $current)]);
                        $hasGoodSignedContent = true;
                }