hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1427] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-12-06 16:56:23 +03:00
commit 93a80ee915
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pleroma/plugs/user_is_admin_plug.ex
View file

@ -6,13 +6,20 @@ 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
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: %Pleroma.User{is_admin: true}}} = conn, _) do
conn
end
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.
@ -23,14 +30,6 @@ defmodule Pleroma.Plugs.UserIsAdminPlug do
end
end
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
end
end
def call(conn, _) do
fail(conn)
end