X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInbox.php;h=35160bd88d03a4e92f0ae8afec80187e732a00d5;hb=774d04cd2fbdfaa36beb74b8a38b025c96184ff9;hp=dafc418f69ef7eb39f3a044cc19fba477b9bbdcc;hpb=61e2c7d20dfcf3eba7442c2b181d22b8926062e3;p=friendica.git

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index dafc418f69..35160bd88d 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -2,18 +2,23 @@
 /**
  * @file src/Module/Inbox.php
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Protocol\ActivityPub;
+use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Util\HTTPSignature;
 
 /**
  * ActivityPub Inbox
  */
 class Inbox extends BaseModule
 {
-	public static function init()
+	public static function rawContent()
 	{
 		$a = self::getApp();
 
@@ -23,18 +28,29 @@ class Inbox extends BaseModule
 			System::httpExit(400);
 		}
 
-		if (ActivityPub::verifySignature($postdata, $_SERVER)) {
-			$filename = 'signed-activitypub';
-		} else {
-			$filename = 'failed-activitypub';
+		if (Config::get('debug', 'ap_inbox_log')) {
+			if (HTTPSignature::getSigner($postdata, $_SERVER)) {
+				$filename = 'signed-activitypub';
+			} else {
+				$filename = 'failed-activitypub';
+			}
+			$tempfile = tempnam(get_temppath(), $filename);
+			file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+			Logger::log('Incoming message stored under ' . $tempfile);
 		}
 
-		$tempfile = tempnam(get_temppath(), $filename);
-		file_put_contents($tempfile, json_encode(['header' => $_SERVER, 'body' => $postdata]));
-
-		logger('Incoming message stored under ' . $tempfile);
+		// @TODO: Replace with parameter from router
+		if (!empty($a->argv[1])) {
+			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+			if (!DBA::isResult($user)) {
+				System::httpExit(404);
+			}
+			$uid = $user['uid'];
+		} else {
+			$uid = 0;
+		}
 
-		ActivityPub::processInbox($postdata, $_SERVER);
+		ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
 		System::httpExit(202);
 	}