X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=cede21b3c40039a6cd6d421aeebb2b272a7676f0;hb=c1e8dbdbae47e79d6c9b82f4183182b0b533fb6a;hp=61e95a52cc03b79cc39b29a44d26090ec2783ba4;hpb=61da51c2d51342bb338cba67191b50442488eeb3;p=friendica.git

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 61e95a52cc..cede21b3c4 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -22,9 +22,11 @@
 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;
 
 /**
@@ -314,14 +316,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], Database::INSERT_IGNORE);
 			$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
 		}
 
@@ -375,8 +378,7 @@ class HTTPSignature
 	 */
 	public static function fetch($request, $uid)
 	{
-		$opts = ['accept_content' => 'application/activity+json, application/ld+json'];
-		$curlResult = self::fetchRaw($request, $uid, false, $opts);
+		$curlResult = self::fetchRaw($request, $uid);
 
 		if (empty($curlResult)) {
 			return false;
@@ -403,17 +405,15 @@ 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
 	 *
 	 * @return object CurlResult
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetchRaw($request, $uid = 0, $binary = false, $opts = [])
+	public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => 'application/activity+json, application/ld+json'])
 	{
-		$headers = [];
+		$header = [];
 
 		if (!empty($uid)) {
 			$owner = User::getOwnerDataById($uid);
@@ -433,23 +433,23 @@ class HTTPSignature
 			$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 . '"';
+			$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;
 
-		if ($opts['nobody']) {
+		if (!empty($opts['nobody'])) {
 			$curlResult = DI::httpRequest()->head($request, $curl_opts);
 		} else {
 			$curlResult = DI::httpRequest()->get($request, $curl_opts);
@@ -545,11 +545,22 @@ class HTTPSignature
 		}
 
 		$key = self::fetchKey($sig_block['keyId'], $actor);
-
 		if (empty($key)) {
 			return false;
 		}
 
+		if (!empty($key['url']) && !empty($key['type']) && ($key['type'] == 'Tombstone')) {
+			Logger::info('Actor is a tombstone', ['key' => $key]);
+
+			// We now delete everything that we possibly knew from this actor
+			Contact::deleteContactByUrl($key['url']);
+			return false;
+		}
+
+		if (empty($key['pubkey'])) {
+			return false;
+		}
+
 		if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
 			return false;
 		}
@@ -617,12 +628,12 @@ class HTTPSignature
 		$profile = APContact::getByURL($url);
 		if (!empty($profile)) {
 			Logger::log('Taking key from id ' . $id, Logger::DEBUG);
-			return ['url' => $url, 'pubkey' => $profile['pubkey']];
+			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']];
+				return ['url' => $actor, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']];
 			}
 		}