X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fplugs%2Foauth_scopes_plug.ex;h=38df074adfdd3cc607c476fa1b3f8ec238c9a4d9;hb=99a6c660a909d8c74289015b3f69357196256112;hp=41403047efec8369fc8fbd011b1ac4b2b53c2922;hpb=b63faf9819c2c49d2e9b63e7f37136eb03d8b4e8;p=akkoma
diff --git a/lib/pleroma/plugs/oauth_scopes_plug.ex b/lib/pleroma/plugs/oauth_scopes_plug.ex
index 41403047e..38df074ad 100644
--- a/lib/pleroma/plugs/oauth_scopes_plug.ex
+++ b/lib/pleroma/plugs/oauth_scopes_plug.ex
@@ -1,11 +1,14 @@
# 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.OAuthScopesPlug do
import Plug.Conn
import Pleroma.Web.Gettext
+ alias Pleroma.Config
+ alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
+
@behaviour Plug
def init(%{scopes: _} = options), do: options
@@ -13,22 +16,22 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
def call(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
op = options[:op] || :|
token = assigns[:token]
- matched_scopes = token && filter_descendants(scopes, token.scopes)
- cond do
- is_nil(token) ->
- conn
+ scopes = transform_scopes(scopes, options)
+ matched_scopes = (token && filter_descendants(scopes, token.scopes)) || []
- op == :| && Enum.any?(matched_scopes) ->
+ cond do
+ token && op == :| && Enum.any?(matched_scopes) ->
conn
- op == :& && matched_scopes == scopes ->
+ token && op == :& && matched_scopes == scopes ->
conn
options[:fallback] == :proceed_unauthenticated ->
conn
|> assign(:user, nil)
|> assign(:token, nil)
+ |> maybe_perform_instance_privacy_check(options)
true ->
missing_scopes = scopes -- matched_scopes
@@ -56,4 +59,21 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
end
)
end
+
+ @doc "Transforms scopes by applying supported options (e.g. :admin)"
+ def transform_scopes(scopes, options) do
+ if options[:admin] do
+ Config.oauth_admin_scopes(scopes)
+ else
+ scopes
+ end
+ end
+
+ defp maybe_perform_instance_privacy_check(%Plug.Conn{} = conn, options) do
+ if options[:skip_instance_privacy_check] do
+ conn
+ else
+ EnsurePublicOrAuthenticatedPlug.call(conn, [])
+ end
+ end
end