X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fplugs%2Fuser_is_admin_plug.ex;h=2748102dff6e90bcdc21e9a9c4051b2d79cbe965;hb=918a8094fc175ed71ccb7305d606fb0b221163f6;hp=8814556f1c6b9a42735cc81e4316a1b15f9d502d;hpb=af42c00cfffb2cd8e93857cd1cf2901113c45bd2;p=akkoma
diff --git a/lib/pleroma/plugs/user_is_admin_plug.ex b/lib/pleroma/plugs/user_is_admin_plug.ex
index 8814556f1..2748102df 100644
--- a/lib/pleroma/plugs/user_is_admin_plug.ex
+++ b/lib/pleroma/plugs/user_is_admin_plug.ex
@@ -1,5 +1,5 @@
# 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
@@ -13,21 +13,21 @@ defmodule Pleroma.Plugs.UserIsAdminPlug do
options
end
- def call(%Plug.Conn{assigns: %{token: %OAuth.Token{scopes: oauth_scopes} = _token}} = conn, _) do
- if OAuth.Scopes.contains_admin_scopes?(oauth_scopes) do
- # Note: checking for _any_ admin scope presence, not necessarily fitting requested action.
- # Thus, controller must explicitly invoke OAuthScopesPlug to verify scope requirements.
- conn
- else
- fail(conn)
- end
- end
+ def call(%{assigns: %{user: %User{is_admin: true}} = assigns} = conn, _) do
+ token = assigns[:token]
+
+ 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.
+ # Admin might opt out of admin scope for some apps to block any admin actions from them.
+ conn
- unless Pleroma.Config.enforce_oauth_admin_scope_usage?() do
- # To do: once AdminFE makes use of "admin" scope, disable the following func definition
- # (fail on no admin scope(s) in token even if `is_admin` is true)
- def call(%Plug.Conn{assigns: %{user: %User{is_admin: true}}} = conn, _) do
- conn
+ true ->
+ fail(conn)
end
end