Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
This commit is contained in:
parent
8444e7ee96
commit
fc81e5a49c
14 changed files with 113 additions and 39 deletions
13
lib/pleroma/plugs/auth_expected_plug.ex
Normal file
13
lib/pleroma/plugs/auth_expected_plug.ex
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# Pleroma: A lightweight social networking server
|
||||
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
defmodule Pleroma.Plugs.AuthExpectedPlug do
|
||||
import Plug.Conn
|
||||
|
||||
def init(options), do: options
|
||||
|
||||
def call(conn, _) do
|
||||
put_private(conn, :auth_expected, true)
|
||||
end
|
||||
end
|
||||
|
|
@ -8,12 +8,15 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
|
|||
|
||||
alias Pleroma.Config
|
||||
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
|
||||
alias Pleroma.Plugs.PlugHelper
|
||||
|
||||
@behaviour Plug
|
||||
|
||||
def init(%{scopes: _} = options), do: options
|
||||
|
||||
def call(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
|
||||
conn = PlugHelper.append_to_called_plugs(conn, __MODULE__)
|
||||
|
||||
op = options[:op] || :|
|
||||
token = assigns[:token]
|
||||
|
||||
|
|
|
|||
38
lib/pleroma/plugs/plug_helper.ex
Normal file
38
lib/pleroma/plugs/plug_helper.ex
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
# Pleroma: A lightweight social networking server
|
||||
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
defmodule Pleroma.Plugs.PlugHelper do
|
||||
@moduledoc "Pleroma Plug helper"
|
||||
|
||||
def append_to_called_plugs(conn, plug_module) do
|
||||
append_to_private_list(conn, :called_plugs, plug_module)
|
||||
end
|
||||
|
||||
def append_to_skipped_plugs(conn, plug_module) do
|
||||
append_to_private_list(conn, :skipped_plugs, plug_module)
|
||||
end
|
||||
|
||||
def plug_called?(conn, plug_module) do
|
||||
contained_in_private_list?(conn, :called_plugs, plug_module)
|
||||
end
|
||||
|
||||
def plug_skipped?(conn, plug_module) do
|
||||
contained_in_private_list?(conn, :skipped_plugs, plug_module)
|
||||
end
|
||||
|
||||
def plug_called_or_skipped?(conn, plug_module) do
|
||||
plug_called?(conn, plug_module) || plug_skipped?(conn, plug_module)
|
||||
end
|
||||
|
||||
defp append_to_private_list(conn, private_variable, value) do
|
||||
list = conn.private[private_variable] || []
|
||||
modified_list = Enum.uniq(list ++ [value])
|
||||
Plug.Conn.put_private(conn, private_variable, modified_list)
|
||||
end
|
||||
|
||||
defp contained_in_private_list?(conn, private_variable, value) do
|
||||
list = conn.private[private_variable] || []
|
||||
value in list
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue