AuthenticationPlug: Also update crypt passwords.

This commit is contained in:
lain 2020-05-17 11:40:25 +02:00
parent baef35bcc8
commit bfdd90f6d7
2 changed files with 30 additions and 2 deletions

View File

@ -31,6 +31,16 @@ def checkpw(_password, _password_hash) 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 @@ def maybe_update_password(%User{password_hash: "$2" <> _} = user, password) 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(

View File

@ -68,6 +68,26 @@ test "with a bcrypt hash, it updates to a pkbdf2 hash", %{conn: conn} 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 =