Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make #increment_failed_attempts concurrency safe #4996

Merged
merged 3 commits into from
Dec 28, 2018
Merged

Make #increment_failed_attempts concurrency safe #4996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
597cfb2
Make `#increment_failed_attempts` concurrency safe
tegon Dec 26, 2018
790f577
Replace `#increment!` with `.increment_counter`
tegon Dec 26, 2018
1ab4de9
Remove unecessary calls to `#save`
tegon Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/devise/models/lockable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ def valid_for_authentication?
end

def increment_failed_attempts
self.failed_attempts ||= 0
self.failed_attempts += 1
self.class.increment_counter(:failed_attempts, id)
reload
end

def unauthenticated_message
Expand Down
11 changes: 11 additions & 0 deletions test/models/lockable_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ def setup
end
end

test "should read failed_attempts from database when incrementing" do
user = create_user
initial_failed_attempts = user.failed_attempts
same_user = User.find(user.id)

user.increment_failed_attempts
same_user.increment_failed_attempts

assert_equal initial_failed_attempts + 2, user.reload.failed_attempts
end

test 'should be valid for authentication with a unlocked user' do
user = create_user
user.lock_access!
Expand Down