X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fuser_is_admin_plug.ex;h=2748102dff6e90bcdc21e9a9c4051b2d79cbe965;hb=6ace22b56a3ced833bd990de5715048d6bd32f80;hp=4a0e43b003e805e182bc462e342bdce18434a18c;hpb=40e1817f707c3c2ef253009c7363cd81b11322a6;p=akkoma
diff --git a/lib/pleroma/plugs/user_is_admin_plug.ex b/lib/pleroma/plugs/user_is_admin_plug.ex
index 4a0e43b00..2748102df 100644
--- a/lib/pleroma/plugs/user_is_admin_plug.ex
+++ b/lib/pleroma/plugs/user_is_admin_plug.ex
@@ -1,34 +1,43 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.UserIsAdminPlug do
import Pleroma.Web.TranslationHelpers
import Plug.Conn
+ alias Pleroma.User
alias Pleroma.Web.OAuth
def init(options) do
options
end
- def call(%Plug.Conn{assigns: assigns} = conn, _) do
+ def call(%{assigns: %{user: %User{is_admin: true}} = assigns} = conn, _) do
token = assigns[:token]
- user = assigns[:user]
cond do
+ not Pleroma.Config.enforce_oauth_admin_scope_usage?() ->
+ conn
+
token && OAuth.Scopes.contains_admin_scopes?(token.scopes) ->
# Note: checking for _any_ admin scope presence, not necessarily fitting requested action.
# Thus, controller must explicitly invoke OAuthScopesPlug to verify scope requirements.
- conn
-
- user && user.is_admin && !Pleroma.Config.enforce_oauth_admin_scope_usage?() ->
+ # Admin might opt out of admin scope for some apps to block any admin actions from them.
conn
true ->
- conn
- |> render_error(:forbidden, "User is not an admin or OAuth admin scope is not granted.")
- |> halt()
+ fail(conn)
end
end
+
+ def call(conn, _) do
+ fail(conn)
+ end
+
+ defp fail(conn) do
+ conn
+ |> render_error(:forbidden, "User is not an admin or OAuth admin scope is not granted.")
+ |> halt()
+ end
end