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 11c4342c40e6fb74d16c726c98ad36d9feff1a0e..054d2297f1906a31ee4810823299474c8caf5e17 100644
(file)
--- a/
lib/pleroma/plugs/ensure_authenticated_plug.ex
+++ b/
lib/pleroma/plugs/ensure_authenticated_plug.ex
@@
-1,9
+1,10
@@
# 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
import Plug.Conn
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.EnsureAuthenticatedPlug do
import Plug.Conn
+ import Pleroma.Web.TranslationHelpers
alias Pleroma.User
def init(options) do
alias Pleroma.User
def init(options) do
@@
-14,10
+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
conn
- |> put_resp_content_type("application/json")
- |> send_resp(403, Jason.encode!(%{error: "Invalid credentials."}))
- |> halt
+ |> render_error(:forbidden, "Invalid credentials.")
+ |> halt()
end
end
end
end