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

[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).

Browse source
This commit is contained in:
Ivan Tashkinov 2019-09-15 18:22:08 +03:00
commit e6f43a831b
14 changed files with 374 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/plugs/oauth_scopes_plug.ex
View file

@ -6,6 +6,8 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
import Plug.Conn
import Pleroma.Web.Gettext
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
@behaviour Plug
def init(%{scopes: _} = options), do: options
@ -17,7 +19,7 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
cond do
is_nil(token) ->
conn
maybe_perform_instance_privacy_check(conn, options)
op == :| && Enum.any?(matched_scopes) ->
conn
@ -29,6 +31,7 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
conn
|> assign(:user, nil)
|> assign(:token, nil)
|> maybe_perform_instance_privacy_check(options)
true ->
missing_scopes = scopes -- matched_scopes
@ -56,4 +59,11 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
end
)
end
defp maybe_perform_instance_privacy_check(%Plug.Conn{} = conn, options) do
case options[:skip_instance_privacy_check] do
true -> conn
_ -> EnsurePublicOrAuthenticatedPlug.call(conn, [])
end
end
end