X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fo_auth%2Fscopes.ex;h=7fe04b9127fd9905bb01b5738a58b33c57ed643f;hb=18bf82d7479b0bb767a657e1b7447529f9c2884f;hp=90b9a04715050dabc0266b97beabff80fa19e3e9;hpb=ddf36b096e3f6e2fa1cdca5d59db98ade696df20;p=akkoma
diff --git a/lib/pleroma/web/o_auth/scopes.ex b/lib/pleroma/web/o_auth/scopes.ex
index 90b9a0471..7fe04b912 100644
--- a/lib/pleroma/web/o_auth/scopes.ex
+++ b/lib/pleroma/web/o_auth/scopes.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.Scopes do
@@ -56,12 +56,20 @@ defmodule Pleroma.Web.OAuth.Scopes do
@doc """
Validates scopes.
"""
- @spec validate(list() | nil, list()) ::
- {:ok, list()} | {:error, :missing_scopes | :unsupported_scopes}
- def validate(blank_scopes, _app_scopes) when blank_scopes in [nil, []],
+ @spec validate(list() | nil, list(), Pleroma.User.t()) ::
+ {:ok, list()} | {:error, :missing_scopes | :unsupported_scopes, :user_is_not_an_admin}
+ def validate(blank_scopes, _app_scopes, _user) when blank_scopes in [nil, []],
do: {:error, :missing_scopes}
- def validate(scopes, app_scopes) do
+ def validate(scopes, app_scopes, %Pleroma.User{is_admin: is_admin}) do
+ if !is_admin && contains_admin_scopes?(scopes) do
+ {:error, :user_is_not_an_admin}
+ else
+ validate_scopes_are_supported(scopes, app_scopes)
+ end
+ end
+
+ defp validate_scopes_are_supported(scopes, app_scopes) do
case OAuthScopesPlug.filter_descendants(scopes, app_scopes) do
^scopes -> {:ok, scopes}
_ -> {:error, :unsupported_scopes}