Remove race condition-prone upgrade_on_auth code
Hashes are still upgraded on next password change
COUCHDB-2991
diff --git a/src/couch_httpd_auth.erl b/src/couch_httpd_auth.erl
index c305ad9..ff0f73c 100644
--- a/src/couch_httpd_auth.erl
+++ b/src/couch_httpd_auth.erl
@@ -397,11 +397,9 @@
maybe_upgrade_password_hash(Req, UserName, Password, UserProps,
AuthModule, AuthCtx) ->
- Upgrade = config:get_boolean("couch_httpd_auth", "upgrade_password_on_auth", true),
IsAdmin = lists:member(<<"_admin">>, couch_util:get_value(<<"roles">>, UserProps, [])),
- case {IsAdmin, Upgrade,
- couch_util:get_value(<<"password_scheme">>, UserProps, <<"simple">>)} of
- {false, true, <<"simple">>} ->
+ case {IsAdmin, couch_util:get_value(<<"password_scheme">>, UserProps, <<"simple">>)} of
+ {false, <<"simple">>} ->
UserProps2 = proplists:delete(<<"password_sha">>, UserProps),
UserProps3 = [{<<"password">>, Password} | UserProps2],
NewUserDoc = couch_doc:from_json_obj({UserProps3}),
