projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
oauth_scopes_plug.ex
diff --git
a/lib/pleroma/plugs/oauth_scopes_plug.ex
b/lib/pleroma/plugs/oauth_scopes_plug.ex
index 174a8389c6789c6d06edc36f8e9bd380ba5878dc..66f48c28c600f8fda50dea5c326edf47027125cc 100644
(file)
--- a/
lib/pleroma/plugs/oauth_scopes_plug.ex
+++ b/
lib/pleroma/plugs/oauth_scopes_plug.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.OAuthScopesPlug do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.OAuthScopesPlug do
@@
-8,26
+8,26
@@
defmodule Pleroma.Plugs.OAuthScopesPlug do
alias Pleroma.Config
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Config
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
+ alias Pleroma.Plugs.PlugHelper
+
+ use Pleroma.Web, :plug
@behaviour Plug
def init(%{scopes: _} = options), do: options
@behaviour Plug
def init(%{scopes: _} = options), do: options
- def
call
(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
+ def
perform
(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
op = options[:op] || :|
token = assigns[:token]
scopes = transform_scopes(scopes, options)
op = options[:op] || :|
token = assigns[:token]
scopes = transform_scopes(scopes, options)
- matched_scopes =
token && filter_descendants(scopes, token.scopes)
+ matched_scopes =
(token && filter_descendants(scopes, token.scopes)) || []
cond do
cond do
- is_nil(token) ->
- maybe_perform_instance_privacy_check(conn, options)
-
- op == :| && Enum.any?(matched_scopes) ->
+ token && op == :| && Enum.any?(matched_scopes) ->
conn
conn
- op == :& && matched_scopes == scopes ->
+
token &&
op == :& && matched_scopes == scopes ->
conn
options[:fallback] == :proceed_unauthenticated ->
conn
options[:fallback] == :proceed_unauthenticated ->