hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'remove-crypt' into 'develop'

Browse source 
Remove crypt(3) support

Closes #3030 and #3062

See merge request pleroma/pleroma!3847
This commit is contained in:
tusooa 2023-03-12 16:06:00 +00:00 • committed by Haelwenn (lanodan) Monnier
commit 40f14fd31c
5 changed files with 1 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/plugs/authentication_plug.ex
View file

@ -38,10 +38,6 @@ defmodule Pleroma.Web.Plugs.AuthenticationPlug do
def call(conn, _), do: conn
def checkpw(password, "$6" <> _ = password_hash) do
:crypt.crypt(password, password_hash) == password_hash
end
def checkpw(password, "$2" <> _ = password_hash) do
# Handle bcrypt passwords for Mastodon migration
Bcrypt.verify_pass(password, password_hash)
@ -60,10 +56,6 @@ defmodule Pleroma.Web.Plugs.AuthenticationPlug 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