forked from AkkomaGang/akkoma
[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
This commit is contained in:
parent
d50a3345ae
commit
e9859b68fc
14 changed files with 178 additions and 131 deletions
|
@ -20,20 +20,26 @@ defmodule Pleroma.Helpers.AuthHelper do
|
||||||
|> OAuthScopesPlug.skip_plug()
|
|> OAuthScopesPlug.skip_plug()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc "Drops authentication info from connection"
|
||||||
def drop_auth_info(conn) do
|
def drop_auth_info(conn) do
|
||||||
|
# To simplify debugging, setting a private variable on `conn` if auth info is dropped
|
||||||
conn
|
conn
|
||||||
|> assign(:user, nil)
|
|> assign(:user, nil)
|
||||||
|> assign(:token, nil)
|
|> assign(:token, nil)
|
||||||
|
|> put_private(:authentication_ignored, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc "Gets OAuth token string from session"
|
||||||
def get_session_token(%Conn{} = conn) do
|
def get_session_token(%Conn{} = conn) do
|
||||||
get_session(conn, @oauth_token_session_key)
|
get_session(conn, @oauth_token_session_key)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc "Updates OAuth token string in session"
|
||||||
def put_session_token(%Conn{} = conn, token) when is_binary(token) do
|
def put_session_token(%Conn{} = conn, token) when is_binary(token) do
|
||||||
put_session(conn, @oauth_token_session_key, token)
|
put_session(conn, @oauth_token_session_key, token)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc "Deletes OAuth token string from session"
|
||||||
def delete_session_token(%Conn{} = conn) do
|
def delete_session_token(%Conn{} = conn) do
|
||||||
delete_session(conn, @oauth_token_session_key)
|
delete_session(conn, @oauth_token_session_key)
|
||||||
end
|
end
|
||||||
|
|
|
@ -20,6 +20,7 @@ defmodule Pleroma.Web do
|
||||||
below.
|
below.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
alias Pleroma.Helpers.AuthHelper
|
||||||
alias Pleroma.Web.Plugs.EnsureAuthenticatedPlug
|
alias Pleroma.Web.Plugs.EnsureAuthenticatedPlug
|
||||||
alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
|
alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
|
||||||
alias Pleroma.Web.Plugs.ExpectAuthenticatedCheckPlug
|
alias Pleroma.Web.Plugs.ExpectAuthenticatedCheckPlug
|
||||||
|
@ -75,7 +76,7 @@ defmodule Pleroma.Web do
|
||||||
defp maybe_drop_authentication_if_oauth_check_ignored(conn) do
|
defp maybe_drop_authentication_if_oauth_check_ignored(conn) do
|
||||||
if PlugHelper.plug_called?(conn, ExpectPublicOrAuthenticatedCheckPlug) and
|
if PlugHelper.plug_called?(conn, ExpectPublicOrAuthenticatedCheckPlug) and
|
||||||
not PlugHelper.plug_called_or_skipped?(conn, OAuthScopesPlug) do
|
not PlugHelper.plug_called_or_skipped?(conn, OAuthScopesPlug) do
|
||||||
OAuthScopesPlug.drop_auth_info(conn)
|
AuthHelper.drop_auth_info(conn)
|
||||||
else
|
else
|
||||||
conn
|
conn
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,13 +13,6 @@ defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do
|
||||||
options
|
options
|
||||||
end
|
end
|
||||||
|
|
||||||
def secret_token do
|
|
||||||
case Pleroma.Config.get(:admin_token) do
|
|
||||||
blank when blank in [nil, ""] -> nil
|
|
||||||
token -> token
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
|
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
|
||||||
|
|
||||||
def call(conn, _) do
|
def call(conn, _) do
|
||||||
|
@ -30,7 +23,7 @@ defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def authenticate(%{params: %{"admin_token" => admin_token}} = conn) do
|
defp authenticate(%{params: %{"admin_token" => admin_token}} = conn) do
|
||||||
if admin_token == secret_token() do
|
if admin_token == secret_token() do
|
||||||
assign_admin_user(conn)
|
assign_admin_user(conn)
|
||||||
else
|
else
|
||||||
|
@ -38,7 +31,7 @@ defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def authenticate(conn) do
|
defp authenticate(conn) do
|
||||||
token = secret_token()
|
token = secret_token()
|
||||||
|
|
||||||
case get_req_header(conn, "x-admin-token") do
|
case get_req_header(conn, "x-admin-token") do
|
||||||
|
@ -48,6 +41,13 @@ defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp secret_token do
|
||||||
|
case Pleroma.Config.get(:admin_token) do
|
||||||
|
blank when blank in [nil, ""] -> nil
|
||||||
|
token -> token
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp assign_admin_user(conn) do
|
defp assign_admin_user(conn) do
|
||||||
conn
|
conn
|
||||||
|> assign(:user, %User{is_admin: true})
|
|> assign(:user, %User{is_admin: true})
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
# Pleroma: A lightweight social networking server
|
|
||||||
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
|
|
||||||
defmodule Pleroma.Web.Plugs.EnsureUserKeyPlug do
|
|
||||||
import Plug.Conn
|
|
||||||
|
|
||||||
@moduledoc "Ensures `conn.assigns.user` is initialized."
|
|
||||||
|
|
||||||
def init(opts) do
|
|
||||||
opts
|
|
||||||
end
|
|
||||||
|
|
||||||
def call(%{assigns: %{user: _}} = conn, _), do: conn
|
|
||||||
|
|
||||||
def call(conn, _) do
|
|
||||||
assign(conn, :user, nil)
|
|
||||||
end
|
|
||||||
end
|
|
36
lib/pleroma/web/plugs/ensure_user_token_assigns_plug.ex
Normal file
36
lib/pleroma/web/plugs/ensure_user_token_assigns_plug.ex
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug do
|
||||||
|
import Plug.Conn
|
||||||
|
|
||||||
|
alias Pleroma.Helpers.AuthHelper
|
||||||
|
alias Pleroma.User
|
||||||
|
alias Pleroma.Web.OAuth.Token
|
||||||
|
|
||||||
|
@moduledoc "Ensures presence and consistency of :user and :token assigns."
|
||||||
|
|
||||||
|
def init(opts) do
|
||||||
|
opts
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(%{assigns: %{user: %User{id: user_id}} = assigns} = conn, _) do
|
||||||
|
with %Token{user_id: ^user_id} <- assigns[:token] do
|
||||||
|
conn
|
||||||
|
else
|
||||||
|
%Token{} ->
|
||||||
|
# A safety net for abnormal (unexpected) scenario: :token belongs to another user
|
||||||
|
AuthHelper.drop_auth_info(conn)
|
||||||
|
|
||||||
|
_ ->
|
||||||
|
assign(conn, :token, nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(conn, _) do
|
||||||
|
conn
|
||||||
|
|> assign(:user, nil)
|
||||||
|
|> assign(:token, nil)
|
||||||
|
end
|
||||||
|
end
|
|
@ -3,6 +3,7 @@
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlug do
|
defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlug do
|
||||||
|
alias Pleroma.Helpers.AuthHelper
|
||||||
alias Pleroma.Signature
|
alias Pleroma.Signature
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Web.ActivityPub.Utils
|
alias Pleroma.Web.ActivityPub.Utils
|
||||||
|
@ -12,6 +13,47 @@ defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlug do
|
||||||
|
|
||||||
def init(options), do: options
|
def init(options), do: options
|
||||||
|
|
||||||
|
def call(%{assigns: %{user: %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
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> AuthHelper.skip_oauth()
|
||||||
|
else
|
||||||
|
{:user_match, false} ->
|
||||||
|
Logger.debug("Failed to map identity from signature (payload actor mismatch)")
|
||||||
|
Logger.debug("key_id=#{inspect(key_id_from_conn(conn))}, actor=#{inspect(actor)}")
|
||||||
|
assign(conn, :valid_signature, false)
|
||||||
|
|
||||||
|
# remove me once testsuite uses mapped capabilities instead of what we do now
|
||||||
|
{:user, nil} ->
|
||||||
|
Logger.debug("Failed to map identity from signature (lookup failure)")
|
||||||
|
Logger.debug("key_id=#{inspect(key_id_from_conn(conn))}, actor=#{actor}")
|
||||||
|
conn
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# no payload, probably a signed fetch
|
||||||
|
def call(%{assigns: %{valid_signature: true}} = conn, _opts) do
|
||||||
|
with %User{} = user <- user_from_key_id(conn) do
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> AuthHelper.skip_oauth()
|
||||||
|
else
|
||||||
|
_ ->
|
||||||
|
Logger.debug("Failed to map identity from signature (no payload actor mismatch)")
|
||||||
|
Logger.debug("key_id=#{inspect(key_id_from_conn(conn))}")
|
||||||
|
assign(conn, :valid_signature, false)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# no signature at all
|
||||||
|
def call(conn, _opts), do: conn
|
||||||
|
|
||||||
defp key_id_from_conn(conn) do
|
defp key_id_from_conn(conn) do
|
||||||
with %{"keyId" => key_id} <- HTTPSignatures.signature_for_conn(conn),
|
with %{"keyId" => key_id} <- HTTPSignatures.signature_for_conn(conn),
|
||||||
{:ok, ap_id} <- Signature.key_id_to_actor_id(key_id) do
|
{:ok, ap_id} <- Signature.key_id_to_actor_id(key_id) do
|
||||||
|
@ -31,41 +73,4 @@ defmodule Pleroma.Web.Plugs.MappedSignatureToIdentityPlug do
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
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, :user, user)
|
|
||||||
else
|
|
||||||
{:user_match, false} ->
|
|
||||||
Logger.debug("Failed to map identity from signature (payload actor mismatch)")
|
|
||||||
Logger.debug("key_id=#{inspect(key_id_from_conn(conn))}, actor=#{inspect(actor)}")
|
|
||||||
assign(conn, :valid_signature, false)
|
|
||||||
|
|
||||||
# remove me once testsuite uses mapped capabilities instead of what we do now
|
|
||||||
{:user, nil} ->
|
|
||||||
Logger.debug("Failed to map identity from signature (lookup failure)")
|
|
||||||
Logger.debug("key_id=#{inspect(key_id_from_conn(conn))}, actor=#{actor}")
|
|
||||||
conn
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# 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, :user, user)
|
|
||||||
else
|
|
||||||
_ ->
|
|
||||||
Logger.debug("Failed to map identity from signature (no payload actor mismatch)")
|
|
||||||
Logger.debug("key_id=#{inspect(key_id_from_conn(conn))}")
|
|
||||||
assign(conn, :valid_signature, false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# no signature at all
|
|
||||||
def call(conn, _opts), do: conn
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,6 +7,7 @@ defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
|
||||||
import Pleroma.Web.Gettext
|
import Pleroma.Web.Gettext
|
||||||
|
|
||||||
alias Pleroma.Config
|
alias Pleroma.Config
|
||||||
|
alias Pleroma.Helpers.AuthHelper
|
||||||
|
|
||||||
use Pleroma.Web, :plug
|
use Pleroma.Web, :plug
|
||||||
|
|
||||||
|
@ -28,7 +29,7 @@ defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
|
||||||
conn
|
conn
|
||||||
|
|
||||||
options[:fallback] == :proceed_unauthenticated ->
|
options[:fallback] == :proceed_unauthenticated ->
|
||||||
drop_auth_info(conn)
|
AuthHelper.drop_auth_info(conn)
|
||||||
|
|
||||||
true ->
|
true ->
|
||||||
missing_scopes = scopes -- matched_scopes
|
missing_scopes = scopes -- matched_scopes
|
||||||
|
@ -44,15 +45,6 @@ defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc "Drops authentication info from connection"
|
|
||||||
def drop_auth_info(conn) do
|
|
||||||
# To simplify debugging, setting a private variable on `conn` if auth info is dropped
|
|
||||||
conn
|
|
||||||
|> put_private(:authentication_ignored, true)
|
|
||||||
|> assign(:user, nil)
|
|
||||||
|> assign(:token, nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
@doc "Keeps those of `scopes` which are descendants of `supported_scopes`"
|
@doc "Keeps those of `scopes` which are descendants of `supported_scopes`"
|
||||||
def filter_descendants(scopes, supported_scopes) do
|
def filter_descendants(scopes, supported_scopes) do
|
||||||
Enum.filter(
|
Enum.filter(
|
||||||
|
|
|
@ -11,11 +11,9 @@ defmodule Pleroma.Web.Plugs.UserEnabledPlug do
|
||||||
end
|
end
|
||||||
|
|
||||||
def call(%{assigns: %{user: %User{} = user}} = conn, _) do
|
def call(%{assigns: %{user: %User{} = user}} = conn, _) do
|
||||||
case User.account_status(user) do
|
if User.account_status(user) == :active do
|
||||||
:active ->
|
|
||||||
conn
|
conn
|
||||||
|
else
|
||||||
_ ->
|
|
||||||
AuthHelper.drop_auth_info(conn)
|
AuthHelper.drop_auth_info(conn)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -34,7 +34,7 @@ defmodule Pleroma.Web.Router do
|
||||||
plug(:fetch_session)
|
plug(:fetch_session)
|
||||||
plug(Pleroma.Web.Plugs.OAuthPlug)
|
plug(Pleroma.Web.Plugs.OAuthPlug)
|
||||||
plug(Pleroma.Web.Plugs.UserEnabledPlug)
|
plug(Pleroma.Web.Plugs.UserEnabledPlug)
|
||||||
plug(Pleroma.Web.Plugs.EnsureUserKeyPlug)
|
plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
|
||||||
end
|
end
|
||||||
|
|
||||||
pipeline :expect_authentication do
|
pipeline :expect_authentication do
|
||||||
|
@ -55,7 +55,7 @@ defmodule Pleroma.Web.Router do
|
||||||
pipeline :after_auth do
|
pipeline :after_auth do
|
||||||
plug(Pleroma.Web.Plugs.UserEnabledPlug)
|
plug(Pleroma.Web.Plugs.UserEnabledPlug)
|
||||||
plug(Pleroma.Web.Plugs.SetUserSessionIdPlug)
|
plug(Pleroma.Web.Plugs.SetUserSessionIdPlug)
|
||||||
plug(Pleroma.Web.Plugs.EnsureUserKeyPlug)
|
plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
|
||||||
end
|
end
|
||||||
|
|
||||||
pipeline :base_api do
|
pipeline :base_api do
|
||||||
|
@ -99,7 +99,7 @@ defmodule Pleroma.Web.Router do
|
||||||
pipeline :pleroma_html do
|
pipeline :pleroma_html do
|
||||||
plug(:browser)
|
plug(:browser)
|
||||||
plug(:authenticate)
|
plug(:authenticate)
|
||||||
plug(Pleroma.Web.Plugs.EnsureUserKeyPlug)
|
plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
|
||||||
end
|
end
|
||||||
|
|
||||||
pipeline :well_known do
|
pipeline :well_known do
|
||||||
|
@ -291,7 +291,6 @@ defmodule Pleroma.Web.Router do
|
||||||
|
|
||||||
post("/main/ostatus", UtilController, :remote_subscribe)
|
post("/main/ostatus", UtilController, :remote_subscribe)
|
||||||
get("/ostatus_subscribe", RemoteFollowController, :follow)
|
get("/ostatus_subscribe", RemoteFollowController, :follow)
|
||||||
|
|
||||||
post("/ostatus_subscribe", RemoteFollowController, :do_follow)
|
post("/ostatus_subscribe", RemoteFollowController, :do_follow)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -941,7 +941,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
|
||||||
|
|
||||||
describe "/api/pleroma/admin/stats" do
|
describe "/api/pleroma/admin/stats" do
|
||||||
test "status visibility count", %{conn: conn} do
|
test "status visibility count", %{conn: conn} do
|
||||||
admin = insert(:user, is_admin: true)
|
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
CommonAPI.post(user, %{visibility: "public", status: "hey"})
|
CommonAPI.post(user, %{visibility: "public", status: "hey"})
|
||||||
CommonAPI.post(user, %{visibility: "unlisted", status: "hey"})
|
CommonAPI.post(user, %{visibility: "unlisted", status: "hey"})
|
||||||
|
@ -949,7 +948,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
|
||||||
|
|
||||||
response =
|
response =
|
||||||
conn
|
conn
|
||||||
|> assign(:user, admin)
|
|
||||||
|> get("/api/pleroma/admin/stats")
|
|> get("/api/pleroma/admin/stats")
|
||||||
|> json_response(200)
|
|> json_response(200)
|
||||||
|
|
||||||
|
@ -958,7 +956,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "by instance", %{conn: conn} do
|
test "by instance", %{conn: conn} do
|
||||||
admin = insert(:user, is_admin: true)
|
|
||||||
user1 = insert(:user)
|
user1 = insert(:user)
|
||||||
instance2 = "instance2.tld"
|
instance2 = "instance2.tld"
|
||||||
user2 = insert(:user, %{ap_id: "https://#{instance2}/@actor"})
|
user2 = insert(:user, %{ap_id: "https://#{instance2}/@actor"})
|
||||||
|
@ -969,7 +966,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
|
||||||
|
|
||||||
response =
|
response =
|
||||||
conn
|
conn
|
||||||
|> assign(:user, admin)
|
|
||||||
|> get("/api/pleroma/admin/stats", instance: instance2)
|
|> get("/api/pleroma/admin/stats", instance: instance2)
|
||||||
|> json_response(200)
|
|> json_response(200)
|
||||||
|
|
||||||
|
|
|
@ -1415,11 +1415,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
|
||||||
|
|
||||||
describe "GET /api/pleroma/admin/config/descriptions" do
|
describe "GET /api/pleroma/admin/config/descriptions" do
|
||||||
test "structure", %{conn: conn} do
|
test "structure", %{conn: conn} do
|
||||||
admin = insert(:user, is_admin: true)
|
conn = get(conn, "/api/pleroma/admin/config/descriptions")
|
||||||
|
|
||||||
conn =
|
|
||||||
assign(conn, :user, admin)
|
|
||||||
|> get("/api/pleroma/admin/config/descriptions")
|
|
||||||
|
|
||||||
assert [child | _others] = json_response_and_validate_schema(conn, 200)
|
assert [child | _others] = json_response_and_validate_schema(conn, 200)
|
||||||
|
|
||||||
|
@ -1437,11 +1433,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
|
||||||
{:esshd}
|
{:esshd}
|
||||||
])
|
])
|
||||||
|
|
||||||
admin = insert(:user, is_admin: true)
|
conn = get(conn, "/api/pleroma/admin/config/descriptions")
|
||||||
|
|
||||||
conn =
|
|
||||||
assign(conn, :user, admin)
|
|
||||||
|> get("/api/pleroma/admin/config/descriptions")
|
|
||||||
|
|
||||||
children = json_response_and_validate_schema(conn, 200)
|
children = json_response_and_validate_schema(conn, 200)
|
||||||
|
|
||||||
|
|
|
@ -264,9 +264,10 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
|
||||||
assert length(result) == 3
|
assert length(result) == 3
|
||||||
|
|
||||||
# Trying to get the chat of a different user
|
# Trying to get the chat of a different user
|
||||||
|
other_user_chat = Chat.get(other_user.id, user.ap_id)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> assign(:user, other_user)
|
|> get("/api/v1/pleroma/chats/#{other_user_chat.id}/messages")
|
||||||
|> get("/api/v1/pleroma/chats/#{chat.id}/messages")
|
|
||||||
|> json_response_and_validate_schema(404)
|
|> json_response_and_validate_schema(404)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
# Pleroma: A lightweight social networking server
|
|
||||||
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
|
|
||||||
defmodule Pleroma.Web.Plugs.EnsureUserKeyPlugTest do
|
|
||||||
use Pleroma.Web.ConnCase, async: true
|
|
||||||
|
|
||||||
alias Pleroma.Web.Plugs.EnsureUserKeyPlug
|
|
||||||
|
|
||||||
test "if the conn has a user key set, it does nothing", %{conn: conn} do
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> assign(:user, 1)
|
|
||||||
|
|
||||||
ret_conn =
|
|
||||||
conn
|
|
||||||
|> EnsureUserKeyPlug.call(%{})
|
|
||||||
|
|
||||||
assert conn == ret_conn
|
|
||||||
end
|
|
||||||
|
|
||||||
test "if the conn has no key set, it sets it to nil", %{conn: conn} do
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> EnsureUserKeyPlug.call(%{})
|
|
||||||
|
|
||||||
assert Map.has_key?(conn.assigns, :user)
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.Plugs.EnsureUserTokenAssignsPlugTest do
|
||||||
|
use Pleroma.Web.ConnCase, async: true
|
||||||
|
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
alias Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug
|
||||||
|
|
||||||
|
test "with :user assign set to a User record " <>
|
||||||
|
"and :token assign set to a Token belonging to this user, " <>
|
||||||
|
"it does nothing" do
|
||||||
|
%{conn: conn} = oauth_access(["read"])
|
||||||
|
|
||||||
|
ret_conn = EnsureUserTokenAssignsPlug.call(conn, %{})
|
||||||
|
|
||||||
|
assert conn == ret_conn
|
||||||
|
end
|
||||||
|
|
||||||
|
test "with :user assign set to a User record " <>
|
||||||
|
"but :token assign not set or not a Token, " <>
|
||||||
|
"it assigns :token to `nil`",
|
||||||
|
%{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
conn = assign(conn, :user, user)
|
||||||
|
|
||||||
|
ret_conn = EnsureUserTokenAssignsPlug.call(conn, %{})
|
||||||
|
|
||||||
|
assert %{token: nil} = ret_conn.assigns
|
||||||
|
|
||||||
|
ret_conn2 =
|
||||||
|
conn
|
||||||
|
|> assign(:token, 1)
|
||||||
|
|> EnsureUserTokenAssignsPlug.call(%{})
|
||||||
|
|
||||||
|
assert %{token: nil} = ret_conn2.assigns
|
||||||
|
end
|
||||||
|
|
||||||
|
# Abnormal (unexpected) scenario
|
||||||
|
test "with :user assign set to a User record " <>
|
||||||
|
"but :token assign set to a Token NOT belonging to :user, " <>
|
||||||
|
"it drops auth info" do
|
||||||
|
%{conn: conn} = oauth_access(["read"])
|
||||||
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
conn = assign(conn, :user, other_user)
|
||||||
|
|
||||||
|
ret_conn = EnsureUserTokenAssignsPlug.call(conn, %{})
|
||||||
|
|
||||||
|
assert %{user: nil, token: nil} = ret_conn.assigns
|
||||||
|
end
|
||||||
|
|
||||||
|
test "if :user assign is not set to a User record, it sets :user and :token to nil", %{
|
||||||
|
conn: conn
|
||||||
|
} do
|
||||||
|
ret_conn = EnsureUserTokenAssignsPlug.call(conn, %{})
|
||||||
|
|
||||||
|
assert %{user: nil, token: nil} = ret_conn.assigns
|
||||||
|
|
||||||
|
ret_conn2 =
|
||||||
|
conn
|
||||||
|
|> assign(:user, 1)
|
||||||
|
|> EnsureUserTokenAssignsPlug.call(%{})
|
||||||
|
|
||||||
|
assert %{user: nil, token: nil} = ret_conn2.assigns
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue