Rename id helper method.

[akkoma] / lib / pleroma / plugs / http_signature.ex

diff --git a/lib/pleroma/plugs/http_signature.ex b/lib/pleroma/plugs/http_signature.ex
index d2d4bdd635c31e2adc4ae4ab75724f41956bda93..38bcd3a782d688d3748e710bd3de912206cff64d 100644 (file)
--- a/lib/pleroma/plugs/http_signature.ex
+++ b/lib/pleroma/plugs/http_signature.ex
@@ -1,5 +1,6 @@
 defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
   alias Pleroma.Web.HTTPSignatures
+  alias Pleroma.Web.ActivityPub.Utils
   import Plug.Conn
   require Logger
 
@@ -7,21 +8,33 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
     options
   end
 
-  def call(%{assigns: %{valid_signature: true}} = conn, opts) do
+  def call(%{assigns: %{valid_signature: true}} = conn, _opts) do
     conn
   end
 
-  def call(conn, opts) do
-    user = conn.params["actor"]
+  def call(conn, _opts) do
+    user = Utils.get_ap_id(conn.params["actor"])
     Logger.debug("Checking sig for #{user}")
-    if get_req_header(conn, "signature") do
-      conn = conn
-      |> put_req_header("(request-target)", String.downcase("#{conn.method}") <> " #{conn.request_path}")
+    [signature | _] = get_req_header(conn, "signature")
 
-      assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
-    else
-      Logger.debug("No signature header!")
-      conn
+    cond do
+      signature && String.contains?(signature, user) ->
+        conn =
+          conn
+          |> put_req_header(
+            "(request-target)",
+            String.downcase("#{conn.method}") <> " #{conn.request_path}"
+          )
+
+        assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
+
+      signature ->
+        Logger.debug("Signature not from actor")
+        assign(conn, :valid_signature, false)
+
+      true ->
+        Logger.debug("No signature header!")
+        conn
     end
   end
 end