Merge pull request #5907 from nupplaphil/goaway_to_redirectto

[friendica.git] / src / Module / Inbox.php

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index d47419a415c4d08a74ca7a453f5be5124a4975cd..c190be4d1f285c0af1f48d412b10039bc186e7ef 100644 (file)
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -8,13 +8,14 @@ use Friendica\BaseModule;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Util\HTTPSignature;
 
 /**
  * ActivityPub Inbox
  */
 class Inbox extends BaseModule
 {
-       public static function init()
+       public static function rawContent()
        {
                $a = self::getApp();
 
@@ -24,17 +25,19 @@ class Inbox extends BaseModule
                        System::httpExit(400);
                }
 
-               if (ActivityPub::verifySignature($postdata, $_SERVER)) {
+// Enable for test purposes
+/*
+               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]));
+               file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
                logger('Incoming message stored under ' . $tempfile);
-
+*/
                if (!empty($a->argv[1])) {
                        $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
                        if (!DBA::isResult($user)) {
@@ -45,7 +48,7 @@ class Inbox extends BaseModule
                        $uid = 0;
                }
 
-               ActivityPub::processInbox($postdata, $_SERVER, $uid);
+               ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
                System::httpExit(202);
        }