projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
[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 27cd41aec327a38146d8a7ded5be5049f02fa1d9..054d2297f1906a31ee4810823299474c8caf5e17 100644
(file)
--- a/
lib/pleroma/plugs/ensure_authenticated_plug.ex
+++ b/
lib/pleroma/plugs/ensure_authenticated_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.EnsureAuthenticatedPlug do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.EnsureAuthenticatedPlug do
@@
-15,9
+15,24
@@
defmodule Pleroma.Plugs.EnsureAuthenticatedPlug do
conn
end
conn
end
- def call(conn, _) do
+ def call(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
+ end
+
+ def fail(conn) do
conn
|> render_error(:forbidden, "Invalid credentials.")
conn
|> render_error(:forbidden, "Invalid credentials.")
- |> halt
+ |> halt
()
end
end
end
end