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 1a6d7ec7af925a83db0c57208234eca6ffbf88df..edbcb938a0b7eee90fbe3bc019dd055a2560f1fc 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   alias Pleroma.{User, Repo, Object, Activity}
   alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.Federator
 
   require Logger
 
@@ -11,50 +12,38 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   def user(conn, %{"nickname" => nickname}) do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
-      json(conn, UserView.render("user.json", %{user: user}))
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(UserView.render("user.json", %{user: user}))
     end
   end
 
   def object(conn, %{"uuid" => uuid}) do
     with ap_id <- o_status_url(conn, :object, uuid),
          %Object{} = object <- Object.get_cached_by_ap_id(ap_id) do
-      json(conn, ObjectView.render("object.json", %{object: object}))
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(ObjectView.render("object.json", %{object: object}))
     end
   end
 
   # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    # File.write("/tmp/incoming.json", Poison.encode!(params))
-    Logger.info(Poison.encode!(params, [pretty: 2]))
-    with {:ok, _user} <- ap_enabled_actor(params["actor"]),
-         nil <- Activity.get_by_ap_id(params["id"]),
-         {:ok, activity} <- Transmogrifier.handle_incoming(params) do
-      json(conn, "ok")
-    else
-      %Activity{} ->
-        Logger.info("Already had #{params["id"]}")
-        json(conn, "ok")
-      e ->
-        # Just drop those for now
-        Logger.info("Unhandled activity")
-        Logger.info(Poison.encode!(params, [pretty: 2]))
-        json(conn, "ok")
-    end
-  end
-
-  def inbox(conn, params) do
-    Logger.info("Signature error.")
-    Logger.info(inspect(conn.req_headers))
+    Federator.enqueue(:incoming_ap_doc, params)
     json(conn, "ok")
   end
 
-  def ap_enabled_actor(id) do
-    user = User.get_by_ap_id(id)
-    if User.ap_enabled?(user) do
-      {:ok, user}
+  def inbox(conn, params) do
+    headers = Enum.into(conn.req_headers, %{})
+    if !(String.contains?(headers["signature"] || "", params["actor"])) do
+      Logger.info("Signature not from author, relayed message, ignoring.")
     else
-      ActivityPub.make_user_from_ap_id(id)
+      Logger.info("Signature error.")
+      Logger.info("Could not validate #{params["actor"]}")
+      Logger.info(inspect(conn.req_headers))
     end
+
+    json(conn, "ok")
   end
 
   def errors(conn, _e) do