X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInbox.php;h=2cc273b139910c647a141b42bcf484fcdcd58fee;hb=3940e804e3ee4ac921e109f62a73fac2becaa611;hp=86fdae7c90dc28ea2f0a627f1b66f7754e4f94fc;hpb=0a5476591d99af6155dff047795a06da6eb9fc62;p=friendica.git

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 86fdae7c90..2cc273b139 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -2,11 +2,15 @@
 /**
  * @file src/Module/Inbox.php
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Config;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 
@@ -15,33 +19,40 @@ use Friendica\Util\Network;
  */
 class Inbox extends BaseModule
 {
-	public static function init()
+	public static function rawContent()
 	{
 		$a = self::getApp();
-		logger('Blubb: init 1');
-
-		$postdata = file_get_contents('php://input');
 
-		$obj = json_decode($postdata);
+		$postdata = Network::postdata();
 
-		if (empty($obj)) {
-			exit();
+		if (empty($postdata)) {
+			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		$tempfile = tempnam(get_temppath(), 'activitypub');
-		file_put_contents($tempfile, json_encode(['header' => $_SERVER, 'body' => $obj]));
+		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);
+		}
 
-		logger('Blubb: init ' . $tempfile);
-		exit();
-//		goaway($dest);
-	}
+		// @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 {
+			$uid = 0;
+		}
 
-	public static function post()
-	{
-		$a = self::getApp();
+		ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
-		logger('Blubb: post');
-		exit();
-//		goaway($dest);
+		throw new \Friendica\Network\HTTPException\AcceptedException();
 	}
 }