Merge branch 'develop' into feature/activitypub

[akkoma] / lib / pleroma / web / activity_pub / activity_pub_controller.ex

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index a8dfccc4078a71637f5deefea4d30b135abe4884..edbcb938a0b7eee90fbe3bc019dd055a2560f1fc 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -34,9 +34,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   end
 
   def inbox(conn, params) do
-    Logger.info("Signature error.")
-    Logger.info("Could not validate #{params["actor"]}")
-    Logger.info(inspect(conn.req_headers))
+    headers = Enum.into(conn.req_headers, %{})
+    if !(String.contains?(headers["signature"] || "", params["actor"])) do
+      Logger.info("Signature not from author, relayed message, ignoring.")
+    else
+      Logger.info("Signature error.")
+      Logger.info("Could not validate #{params["actor"]}")
+      Logger.info(inspect(conn.req_headers))
+    end
+
     json(conn, "ok")
   end