Simplify AuthenticationPlug
This commit is contained in:
lain
parent
9a96c93be7
commit
32465b9939
2 changed files with 55 additions and 268 deletions
|
|
@ -9,71 +9,32 @@ def init(options) do
|
||||||
|
|
||||||
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
|
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
|
||||||
|
|
||||||
def call(conn, opts) do
|
def call(
|
||||||
with {:ok, username, password} <- decode_header(conn),
|
%{
|
||||||
{:ok, user} <- opts[:fetcher].(username),
|
assigns: %{
|
||||||
false <- !!user.info["deactivated"],
|
auth_user: %{password_hash: password_hash} = auth_user,
|
||||||
saved_user_id <- get_session(conn, :user_id),
|
auth_credentials: %{password: password}
|
||||||
legacy_password <- String.starts_with?(user.password_hash, "$6$"),
|
}
|
||||||
update_legacy_password <-
|
} = conn,
|
||||||
!(Map.has_key?(opts, :update_legacy_password) && opts[:update_legacy_password] == false),
|
_
|
||||||
{:ok, verified_user} <- verify(user, password, saved_user_id) do
|
) do
|
||||||
if legacy_password and update_legacy_password do
|
if Pbkdf2.checkpw(password, password_hash) do
|
||||||
User.reset_password(verified_user, %{
|
|
||||||
:password => password,
|
|
||||||
:password_confirmation => password
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> assign(:user, verified_user)
|
|> assign(:user, auth_user)
|
||||||
|> put_session(:user_id, verified_user.id)
|
|
||||||
else
|
else
|
||||||
_ -> conn |> halt_or_continue(opts)
|
conn
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Short-circuit if we have a cookie with the id for the given user.
|
def call(
|
||||||
defp verify(%{id: id} = user, _password, id) do
|
%{
|
||||||
{:ok, user}
|
assigns: %{
|
||||||
end
|
auth_credentials: %{password: password}
|
||||||
|
}
|
||||||
defp verify(nil, _password, _user_id) do
|
} = conn,
|
||||||
|
_
|
||||||
|
) do
|
||||||
Pbkdf2.dummy_checkpw()
|
Pbkdf2.dummy_checkpw()
|
||||||
:error
|
|
||||||
end
|
|
||||||
|
|
||||||
defp verify(user, password, _user_id) do
|
|
||||||
valid =
|
|
||||||
if String.starts_with?(user.password_hash, "$6$") do
|
|
||||||
:crypt.crypt(password, user.password_hash) == user.password_hash
|
|
||||||
else
|
|
||||||
Pbkdf2.checkpw(password, user.password_hash)
|
|
||||||
end
|
|
||||||
|
|
||||||
if valid do
|
|
||||||
{:ok, user}
|
|
||||||
else
|
|
||||||
:error
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp decode_header(conn) do
|
|
||||||
with ["Basic " <> header] <- get_req_header(conn, "authorization"),
|
|
||||||
{:ok, userinfo} <- Base.decode64(header),
|
|
||||||
[username, password] <- String.split(userinfo, ":", parts: 2) do
|
|
||||||
{:ok, username, password}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp halt_or_continue(conn, %{optional: true}) do
|
|
||||||
conn |> assign(:user, nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp halt_or_continue(conn, _) do
|
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("application/json")
|
|
||||||
|> send_resp(403, Jason.encode!(%{error: "Invalid credentials."}))
|
|
||||||
|> halt
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,224 +4,50 @@ defmodule Pleroma.Plugs.AuthenticationPlugTest do
|
||||||
alias Pleroma.Plugs.AuthenticationPlug
|
alias Pleroma.Plugs.AuthenticationPlug
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
|
|
||||||
defp fetch_nil(_name) do
|
setup %{conn: conn} do
|
||||||
{:ok, nil}
|
user = %User{
|
||||||
|
id: 1,
|
||||||
|
name: "dude",
|
||||||
|
password_hash: Comeonin.Pbkdf2.hashpwsalt("guy")
|
||||||
|
}
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:auth_user, user)
|
||||||
|
|
||||||
|
%{user: user, conn: conn}
|
||||||
end
|
end
|
||||||
|
|
||||||
@user %User{
|
test "it does nothing if a user is assigned", %{conn: conn} do
|
||||||
id: 1,
|
conn =
|
||||||
name: "dude",
|
conn
|
||||||
password_hash: Comeonin.Pbkdf2.hashpwsalt("guy")
|
|> assign(:user, %User{})
|
||||||
}
|
|
||||||
|
|
||||||
@deactivated %User{
|
ret_conn =
|
||||||
id: 1,
|
conn
|
||||||
name: "dude",
|
|> AuthenticationPlug.call(%{})
|
||||||
password_hash: Comeonin.Pbkdf2.hashpwsalt("guy"),
|
|
||||||
info: %{"deactivated" => true}
|
|
||||||
}
|
|
||||||
|
|
||||||
@legacy %User{
|
assert ret_conn == conn
|
||||||
id: 1,
|
|
||||||
name: "dude",
|
|
||||||
password_hash:
|
|
||||||
"$6$9psBWV8gxkGOZWBz$PmfCycChoxeJ3GgGzwvhlgacb9mUoZ.KUXNCssekER4SJ7bOK53uXrHNb2e4i8yPFgSKyzaW9CcmrDXWIEMtD1"
|
|
||||||
}
|
|
||||||
|
|
||||||
@session_opts [
|
|
||||||
store: :cookie,
|
|
||||||
key: "_test",
|
|
||||||
signing_salt: "cooldude"
|
|
||||||
]
|
|
||||||
|
|
||||||
defp fetch_user(_name) do
|
|
||||||
{:ok, @user}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
defp basic_auth_enc(username, password) do
|
test "with a correct password in the credentials, it assigns the auth_user", %{conn: conn} do
|
||||||
"Basic " <> Base.encode64("#{username}:#{password}")
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:auth_credentials, %{password: "guy"})
|
||||||
|
|> AuthenticationPlug.call(%{})
|
||||||
|
|
||||||
|
assert conn.assigns.user == conn.assigns.auth_user
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "without an authorization header" do
|
test "with a wrong password in the credentials, it does nothing", %{conn: conn} do
|
||||||
test "it halts the application" do
|
conn =
|
||||||
conn =
|
conn
|
||||||
build_conn()
|
|> assign(:auth_credentials, %{password: "wrong"})
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> AuthenticationPlug.call(%{})
|
|
||||||
|
|
||||||
assert conn.status == 403
|
ret_conn =
|
||||||
assert conn.halted == true
|
conn
|
||||||
end
|
|> AuthenticationPlug.call(%{})
|
||||||
|
|
||||||
test "it assigns a nil user if the 'optional' option is used" do
|
assert conn == ret_conn
|
||||||
conn =
|
|
||||||
build_conn()
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> AuthenticationPlug.call(%{optional: true})
|
|
||||||
|
|
||||||
assert %{user: nil} == conn.assigns
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "with an authorization header for a nonexisting user" do
|
|
||||||
test "it halts the application" do
|
|
||||||
conn =
|
|
||||||
build_conn()
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> AuthenticationPlug.call(%{fetcher: &fetch_nil/1})
|
|
||||||
|
|
||||||
assert conn.status == 403
|
|
||||||
assert conn.halted == true
|
|
||||||
end
|
|
||||||
|
|
||||||
test "it assigns a nil user if the 'optional' option is used" do
|
|
||||||
conn =
|
|
||||||
build_conn()
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> AuthenticationPlug.call(%{optional: true, fetcher: &fetch_nil/1})
|
|
||||||
|
|
||||||
assert %{user: nil} == conn.assigns
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "with an incorrect authorization header for a enxisting user" do
|
|
||||||
test "it halts the application" do
|
|
||||||
opts = %{
|
|
||||||
fetcher: &fetch_user/1
|
|
||||||
}
|
|
||||||
|
|
||||||
header = basic_auth_enc("dude", "man")
|
|
||||||
|
|
||||||
conn =
|
|
||||||
build_conn()
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> put_req_header("authorization", header)
|
|
||||||
|> AuthenticationPlug.call(opts)
|
|
||||||
|
|
||||||
assert conn.status == 403
|
|
||||||
assert conn.halted == true
|
|
||||||
end
|
|
||||||
|
|
||||||
test "it assigns a nil user if the 'optional' option is used" do
|
|
||||||
opts = %{
|
|
||||||
optional: true,
|
|
||||||
fetcher: &fetch_user/1
|
|
||||||
}
|
|
||||||
|
|
||||||
header = basic_auth_enc("dude", "man")
|
|
||||||
|
|
||||||
conn =
|
|
||||||
build_conn()
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> put_req_header("authorization", header)
|
|
||||||
|> AuthenticationPlug.call(opts)
|
|
||||||
|
|
||||||
assert %{user: nil} == conn.assigns
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "with a correct authorization header for an existing user" do
|
|
||||||
test "it assigns the user", %{conn: conn} do
|
|
||||||
opts = %{
|
|
||||||
optional: true,
|
|
||||||
fetcher: &fetch_user/1
|
|
||||||
}
|
|
||||||
|
|
||||||
header = basic_auth_enc("dude", "guy")
|
|
||||||
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> put_req_header("authorization", header)
|
|
||||||
|> AuthenticationPlug.call(opts)
|
|
||||||
|
|
||||||
assert %{user: @user} == conn.assigns
|
|
||||||
assert get_session(conn, :user_id) == @user.id
|
|
||||||
assert conn.halted == false
|
|
||||||
end
|
|
||||||
|
|
||||||
test "it assigns legacy user", %{conn: conn} do
|
|
||||||
opts = %{
|
|
||||||
optional: true,
|
|
||||||
fetcher: fn _ -> {:ok, @legacy} end,
|
|
||||||
update_legacy_password: false
|
|
||||||
}
|
|
||||||
|
|
||||||
header = basic_auth_enc("dude", "password")
|
|
||||||
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> put_req_header("authorization", header)
|
|
||||||
|> AuthenticationPlug.call(opts)
|
|
||||||
|
|
||||||
assert %{user: @legacy} == conn.assigns
|
|
||||||
assert get_session(conn, :user_id) == @legacy.id
|
|
||||||
assert conn.halted == false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "with a correct authorization header for an deactiviated user" do
|
|
||||||
test "it halts the appication", %{conn: conn} do
|
|
||||||
opts = %{
|
|
||||||
optional: false,
|
|
||||||
fetcher: fn _ -> @deactivated end
|
|
||||||
}
|
|
||||||
|
|
||||||
header = basic_auth_enc("dude", "guy")
|
|
||||||
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> put_req_header("authorization", header)
|
|
||||||
|> AuthenticationPlug.call(opts)
|
|
||||||
|
|
||||||
assert conn.status == 403
|
|
||||||
assert conn.halted == true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "with a user_id in the session for an existing user" do
|
|
||||||
test "it assigns the user", %{conn: conn} do
|
|
||||||
opts = %{
|
|
||||||
optional: true,
|
|
||||||
fetcher: &fetch_user/1
|
|
||||||
}
|
|
||||||
|
|
||||||
header = basic_auth_enc("dude", "THIS IS WRONG")
|
|
||||||
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> Plug.Session.call(Plug.Session.init(@session_opts))
|
|
||||||
|> fetch_session
|
|
||||||
|> put_session(:user_id, @user.id)
|
|
||||||
|> put_req_header("authorization", header)
|
|
||||||
|> AuthenticationPlug.call(opts)
|
|
||||||
|
|
||||||
assert %{user: @user} == conn.assigns
|
|
||||||
assert get_session(conn, :user_id) == @user.id
|
|
||||||
assert conn.halted == false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "with an assigned user" do
|
|
||||||
test "it does nothing, returning the incoming conn", %{conn: conn} do
|
|
||||||
conn =
|
|
||||||
conn
|
|
||||||
|> assign(:user, @user)
|
|
||||||
|
|
||||||
conn_result = AuthenticationPlug.call(conn, %{})
|
|
||||||
|
|
||||||
assert conn == conn_result
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue