X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInbox.php;h=5367adb7e1c8f9e53f55920b7cecc72ec37ab31f;hb=502617afde41f6a4737d7a678d24ea400171dc81;hp=bb0d9ef0404d40bf3735314053465fb8bc0ee5d2;hpb=f7b03bc5f39e0efd8c1b278d665f7babaad58985;p=friendica.git

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index bb0d9ef040..5367adb7e1 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -2,36 +2,56 @@
 /**
  * @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();
 
 		$postdata = file_get_contents('php://input');
 
 		if (empty($postdata)) {
-			System::httpExit(400);
+			throw new \Friendica\Network\HTTPException\BadRequestException();
+		}
+
+		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);
 		}
 
-		if (ActivityPub::verifySignature($postdata, $_SERVER)) {
-			$filename = 'signed-activitypub';
+		// @TODO: Replace with parameter from router
+		if (!empty($a->argv[1])) {
+			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+			if (!DBA::isResult($user)) {
+				throw new \Friendica\Network\HTTPException\NotFoundException();
+			}
+			$uid = $user['uid'];
 		} else {
-			$filename = 'failed-activitypub';
+			$uid = 0;
 		}
 
-		$tempfile = tempnam(get_temppath(), $filename);
-		file_put_contents($tempfile, json_encode(['header' => $_SERVER, 'body' => $postdata]));
+		ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
-		System::httpExit(200);
+		throw new \Friendica\Network\HTTPException\AcceptedException();
 	}
 }