AuthenticationPlug: Also update crypt passwords.
This commit is contained in:
parent
baef35bcc8
commit
bfdd90f6d7
@ -31,6 +31,16 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def maybe_update_password(%User{password_hash: "$2" <> _} = user, password) do
|
def maybe_update_password(%User{password_hash: "$2" <> _} = user, password) do
|
||||||
|
do_update_password(user, password)
|
||||||
|
end
|
||||||
|
|
||||||
|
def maybe_update_password(%User{password_hash: "$6" <> _} = user, password) do
|
||||||
|
do_update_password(user, password)
|
||||||
|
end
|
||||||
|
|
||||||
|
def maybe_update_password(user, _), do: {:ok, user}
|
||||||
|
|
||||||
|
defp do_update_password(user, password) do
|
||||||
user
|
user
|
||||||
|> User.password_update_changeset(%{
|
|> User.password_update_changeset(%{
|
||||||
"password" => password,
|
"password" => password,
|
||||||
@ -39,8 +49,6 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
|
|||||||
|> Pleroma.Repo.update()
|
|> Pleroma.Repo.update()
|
||||||
end
|
end
|
||||||
|
|
||||||
def maybe_update_password(user, _), do: {:ok, user}
|
|
||||||
|
|
||||||
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
|
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
|
||||||
|
|
||||||
def call(
|
def call(
|
||||||
|
@ -68,6 +68,26 @@ defmodule Pleroma.Plugs.AuthenticationPlugTest do
|
|||||||
assert "$pbkdf2" <> _ = user.password_hash
|
assert "$pbkdf2" <> _ = user.password_hash
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "with a crypt hash, it updates to a pkbdf2 hash", %{conn: conn} do
|
||||||
|
user =
|
||||||
|
insert(:user,
|
||||||
|
password_hash:
|
||||||
|
"$6$9psBWV8gxkGOZWBz$PmfCycChoxeJ3GgGzwvhlgacb9mUoZ.KUXNCssekER4SJ7bOK53uXrHNb2e4i8yPFgSKyzaW9CcmrDXWIEMtD1"
|
||||||
|
)
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:auth_user, user)
|
||||||
|
|> assign(:auth_credentials, %{password: "password"})
|
||||||
|
|> AuthenticationPlug.call(%{})
|
||||||
|
|
||||||
|
assert conn.assigns.user.id == conn.assigns.auth_user.id
|
||||||
|
assert PlugHelper.plug_skipped?(conn, OAuthScopesPlug)
|
||||||
|
|
||||||
|
user = User.get_by_id(user.id)
|
||||||
|
assert "$pbkdf2" <> _ = user.password_hash
|
||||||
|
end
|
||||||
|
|
||||||
describe "checkpw/2" do
|
describe "checkpw/2" do
|
||||||
test "check pbkdf2 hash" do
|
test "check pbkdf2 hash" do
|
||||||
hash =
|
hash =
|
||||||
|
Loading…
Reference in New Issue
Block a user