mirror of
https://github.com/basecamp/once-campfire.git
synced 2026-10-28 16:36:48 +09:00
Check the current password whenever the saved password changes
The profile asked for the current password when the request's password
field was filled in. The check now follows the save itself: the model
checks the challenge whenever the password digest is about to change,
and the profile always hands it the challenge. Editing a name, avatar
or email without a new password still needs none, and scripts that
reset a password, which set no challenge, are unaffected.
Only a string counts as a challenge, and the rate limit counts every
non-empty one, so what's limited is exactly what gets checked.
(cherry picked from commit 4a580302a5)
This commit is contained in:
1 parent
6c5ceca6b5
commit
56e2a287ea
4 files changed
+58
-14
No files matched your search
@@ -116,6 +116,18 @@ class Users::ProfilesControllerTest < ActionDispatch::IntegrationTest
|
||||
user: { name: "Someone else", password: "a new secret123456", password_challenge: "not my password" }
|
||||
end
|
||||
|
||||
test "a new password needs the current one however the form spells it" do
|
||||
assert_password_change_refused "Enter your current password to change it.",
|
||||
user: { name: "Someone else", "password(1)" => "a new secret123456" }
|
||||
end
|
||||
|
||||
test "editing the profile with an empty current password doesn't need it" do
|
||||
put user_profile_url, params: { user: { name: "Dave", password: "", password_challenge: "" } }
|
||||
|
||||
assert_redirected_to user_profile_url
|
||||
assert_equal "Dave", users(:david).reload.name
|
||||
end
|
||||
|
||||
test "editing the profile without changing the password doesn't need the current one" do
|
||||
put user_profile_url, params: { user: { name: "Dave", bio: "Acrobat", password: "" } }
|
||||
|
||||
@@ -132,10 +144,30 @@ class Users::ProfilesControllerTest < ActionDispatch::IntegrationTest
|
||||
assert_equal "Too many attempts. Try again in a few minutes.", flash[:alert]
|
||||
assert users(:david).reload.authenticate("secret123456")
|
||||
|
||||
put user_profile_url, params: { user: { password: "a new secret123456" } }
|
||||
assert_equal "Enter your current password to change it.", flash[:alert]
|
||||
|
||||
put user_profile_url, params: { user: { name: "Dave" } }
|
||||
assert_equal "Dave", users(:david).reload.name
|
||||
end
|
||||
|
||||
test "any current password sent counts toward the rate limit, however blank it looks" do
|
||||
Users::ProfilesController.cache_store.stubs(:increment).returns(11)
|
||||
|
||||
put user_profile_url, params: { user: { password: "a new secret123456", password_challenge: " " } }
|
||||
assert_equal "Too many attempts. Try again in a few minutes.", flash[:alert]
|
||||
end
|
||||
|
||||
test "a current password that isn't text is no current password" do
|
||||
[ false, [], {}, 0 ].each do |challenge|
|
||||
put user_profile_url, params: { user: { password: "a new secret123456", password_challenge: challenge } }, as: :json
|
||||
|
||||
assert_redirected_to user_profile_url
|
||||
assert_equal "Enter your current password to change it.", flash[:alert]
|
||||
assert users(:david).reload.authenticate("secret123456")
|
||||
end
|
||||
end
|
||||
|
||||
test "changing the password removes the other devices' push subscriptions, and this browser can register its own again" do
|
||||
stub_web_push_dns_resolution
|
||||
endpoint = push_subscriptions(:david_chrome).attributes.slice("endpoint", "p256dh_key", "auth_key")
|
||||
|
||||
@@ -6,6 +6,14 @@ class UserTest < ActiveSupport::TestCase
|
||||
assert users(:david).valid?
|
||||
end
|
||||
|
||||
test "a password challenge is checked whenever the password would change" do
|
||||
assert_not User.find(users(:david).id).update(password: "a new secret123456", password_challenge: "")
|
||||
assert_not User.find(users(:david).id).update(password: "a new secret123456", password_challenge: "not my password")
|
||||
assert User.find(users(:david).id).update(name: "Dave", password_challenge: "")
|
||||
assert User.find(users(:david).id).update(password: "a new secret123456", password_challenge: "secret123456")
|
||||
assert User.find(users(:david).id).update(password: "another secret123456")
|
||||
end
|
||||
|
||||
test "creating users grants membership to the open rooms" do
|
||||
assert_difference -> { Membership.count }, +Rooms::Open.count do
|
||||
create_new_user
|
||||
|
||||
Reference in new issue
Block a user