Browse Source

mapped signature plug: use `user` assign like authentication plug

tags/v1.1.4
Ariadne Conill 5 years ago
parent
commit
c947cfec5a
2 changed files with 5 additions and 5 deletions
  1. +3
    -3
      lib/pleroma/plugs/mapped_signature_to_identity_plug.ex
  2. +2
    -2
      test/plugs/mapped_identity_to_signature_plug_test.exs

+ 3
- 3
lib/pleroma/plugs/mapped_signature_to_identity_plug.ex View File

@@ -31,14 +31,14 @@ defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlug do
end
end

def call(%{assigns: %{mapped_identity: _}} = conn, _opts), do: conn
def call(%{assigns: %{user: _}} = conn, _opts), do: conn

# if this has payload make sure it is signed by the same actor that made it
def call(%{assigns: %{valid_signature: true}, params: %{"actor" => actor}} = conn, _opts) do
with actor_id <- Utils.get_ap_id(actor),
{:user, %User{} = user} <- {:user, user_from_key_id(conn)},
{:user_match, true} <- {:user_match, user.ap_id == actor_id} do
assign(conn, :mapped_identity, user)
assign(conn, :user, user)
else
{:user_match, false} ->
Logger.debug("Failed to map identity from signature (payload actor mismatch)")
@@ -56,7 +56,7 @@ defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlug do
# no payload, probably a signed fetch
def call(%{assigns: %{valid_signature: true}} = conn, _opts) do
with %User{} = user <- user_from_key_id(conn) do
assign(conn, :mapped_identity, user)
assign(conn, :user, user)
else
_ ->
Logger.debug("Failed to map identity from signature (no payload actor mismatch)")


+ 2
- 2
test/plugs/mapped_identity_to_signature_plug_test.exs View File

@@ -26,7 +26,7 @@ defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlugTest do
|> set_signature("http://mastodon.example.org/users/admin")
|> MappedSignatureToIdentityPlug.call(%{})

refute is_nil(conn.assigns.mapped_identity)
refute is_nil(conn.assigns.user)
end

test "it successfully maps a valid identity with a valid signature with payload" do
@@ -35,7 +35,7 @@ defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlugTest do
|> set_signature("http://mastodon.example.org/users/admin")
|> MappedSignatureToIdentityPlug.call(%{})

refute is_nil(conn.assigns.mapped_identity)
refute is_nil(conn.assigns.user)
end

test "it considers a mapped identity to be invalid when it mismatches a payload" do


Loading…
Cancel
Save