X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=e2de810a606a32c8b33c2ac812e6e859accada65;hb=51ebb1541a62c0fd691d995326d61775cc7d61d3;hp=1ede550885a27117f86f089517dd749b151be270;hpb=1414d43597b89817acc76787b502eaeb58e4876d;p=friendica.git

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 1ede550885..e2de810a60 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,10 +22,13 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Logger;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
+use Friendica\Model\Contact;
 use Friendica\Model\User;
+use Friendica\Network\CurlResult;
 
 /**
  * Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -322,7 +325,7 @@ class HTTPSignature
 
 		$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
 		if (!DBA::isResult($status)) {
-			DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared]);
+			DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE);
 			$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
 		}
 
@@ -406,7 +409,7 @@ class HTTPSignature
 	 *                         'nobody' => only return the header
 	 *                         'cookiejar' => path to cookie jar file
 	 *
-	 * @return object CurlResult
+	 * @return CurlResult CurlResult
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => 'application/activity+json, application/ld+json'])
@@ -471,12 +474,14 @@ class HTTPSignature
 	public static function getSigner($content, $http_headers)
 	{
 		if (empty($http_headers['HTTP_SIGNATURE'])) {
+			Logger::info('No HTTP_SIGNATURE header');
 			return false;
 		}
 
 		if (!empty($content)) {
 			$object = json_decode($content, true);
 			if (empty($object)) {
+				Logger::info('No object');
 				return false;
 			}
 
@@ -505,6 +510,7 @@ class HTTPSignature
 		$sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']);
 
 		if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) {
+			Logger::info('No headers or keyId');
 			return false;
 		}
 
@@ -517,6 +523,7 @@ class HTTPSignature
 		$signed_data = rtrim($signed_data, "\n");
 
 		if (empty($signed_data)) {
+			Logger::info('Signed data is empty');
 			return false;
 		}
 
@@ -539,16 +546,33 @@ class HTTPSignature
 		}
 
 		if (empty($algorithm)) {
+			Logger::info('No alagorithm');
 			return false;
 		}
 
 		$key = self::fetchKey($sig_block['keyId'], $actor);
-
 		if (empty($key)) {
+			Logger::info('Empty key');
+			return false;
+		}
+
+		if (!empty($key['url']) && !empty($key['type']) && ($key['type'] == 'Tombstone')) {
+			Logger::info('Actor is a tombstone', ['key' => $key]);
+
+			if (!Contact::isLocal($key['url'])) {
+				// We now delete everything that we possibly knew from this actor
+				Contact::deleteContactByUrl($key['url']);
+			}
+			return null;
+		}
+
+		if (empty($key['pubkey'])) {
+			Logger::info('Empty pubkey');
 			return false;
 		}
 
 		if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
+			Logger::info('Verification failed');
 			return false;
 		}
 
@@ -567,6 +591,7 @@ class HTTPSignature
 			/// @todo add all hashes from the rfc
 
 			if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) {
+				Logger::info('Digest does not match');
 				return false;
 			}
 
@@ -586,6 +611,7 @@ class HTTPSignature
 		// Check the content-length when it is part of the signed data
 		if (in_array('content-length', $sig_block['headers'])) {
 			if (strlen($content) != $headers['content-length']) {
+				Logger::info('Content length does not match');
 				return false;
 			}
 		}
@@ -593,6 +619,7 @@ class HTTPSignature
 		// Ensure that the authentication had been done with some content
 		// Without this check someone could authenticate with fakeable data
 		if (!$hasGoodSignedContent) {
+			Logger::info('No good signed content');
 			return false;
 		}
 
@@ -614,16 +641,17 @@ class HTTPSignature
 
 		$profile = APContact::getByURL($url);
 		if (!empty($profile)) {
-			Logger::log('Taking key from id ' . $id, Logger::DEBUG);
-			return ['url' => $url, 'pubkey' => $profile['pubkey']];
+			Logger::info('Taking key from id', ['id' => $id]);
+			return ['url' => $url, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']];
 		} elseif ($url != $actor) {
 			$profile = APContact::getByURL($actor);
 			if (!empty($profile)) {
-				Logger::log('Taking key from actor ' . $actor, Logger::DEBUG);
-				return ['url' => $actor, 'pubkey' => $profile['pubkey']];
+				Logger::info('Taking key from actor', ['actor' => $actor]);
+				return ['url' => $actor, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']];
 			}
 		}
 
+		Logger::notice('Key could not be fetched', ['url' => $url, 'actor' => $actor]);
 		return false;
 	}
 }