projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expand and authorize streams in Streamer directly
[akkoma]
/
lib
/
pleroma
/
plugs
/
ensure_authenticated_plug.ex
diff --git
a/lib/pleroma/plugs/ensure_authenticated_plug.ex
b/lib/pleroma/plugs/ensure_authenticated_plug.ex
index 9c8f5597f72764ee9dd31dc6b701a9ce21854299..3fe5508060730e6d40f96860ad774e42896af65d 100644
(file)
--- a/
lib/pleroma/plugs/ensure_authenticated_plug.ex
+++ b/
lib/pleroma/plugs/ensure_authenticated_plug.ex
@@
-15,26
+15,25
@@
defmodule Pleroma.Plugs.EnsureAuthenticatedPlug do
end
@impl true
end
@impl true
- def perform(%{assigns: %{user: %User{}}} = conn, _) do
+ def perform(
+ %{
+ assigns: %{
+ auth_credentials: %{password: _},
+ user: %User{multi_factor_authentication_settings: %{enabled: true}}
+ }
+ } = conn,
+ _
+ ) do
conn
conn
+ |> render_error(:forbidden, "Two-factor authentication enabled, you must use a access token.")
+ |> halt()
end
end
- def perform(conn, options) do
- perform =
- cond do
- options[:if_func] -> options[:if_func].()
- options[:unless_func] -> !options[:unless_func].()
- true -> true
- end
-
- if perform do
- fail(conn)
- else
- conn
- end
+ def perform(%{assigns: %{user: %User{}}} = conn, _) do
+ conn
end
end
- def
fail(conn
) do
+ def
perform(conn, _
) do
conn
|> render_error(:forbidden, "Invalid credentials.")
|> halt()
conn
|> render_error(:forbidden, "Invalid credentials.")
|> halt()