Skip to content

[v13] fix: Verify MFA device locks during authentication#36627

Merged
codingllama merged 2 commits intobranch/v13from
codingllama/backport/36471-v13
Jan 15, 2024
Merged

[v13] fix: Verify MFA device locks during authentication#36627
codingllama merged 2 commits intobranch/v13from
codingllama/backport/36471-v13

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

Backport #36471 to branch/v13.

Fix an oversight on authentication where locked MFA devices could still be used. Applies to password changes as well.

https://github.com/gravitational/security-findings/issues/81

Changelog: Verify MFA device locks during user authentication

* Test authn and password change with a locked user

* Verify MFA device locks during authentication

* Configure a LockWatcher in the passwordSuite setup

* Appease linter
@codingllama
Copy link
Copy Markdown
Contributor Author

Branches v13 (and likely v12) differ significantly on AuthenticateUser when compared to newer branches. The first cherry-pick is pretty much clean, minus some minor variable/method name changes here and there. I've kept changes exclusive to branch/v13 on 184a682 for easier reviews.

Sadly, these make v13 (and v12 to follow) become something that is in-between master and their old form. The alternative would be to backport whatever caused the deviations in the first place, which I elected not to do now.

@codingllama codingllama added this pull request to the merge queue Jan 15, 2024
Merged via the queue into branch/v13 with commit 5d82a5e Jan 15, 2024
@codingllama codingllama deleted the codingllama/backport/36471-v13 branch January 15, 2024 13:46
@camscale camscale mentioned this pull request Feb 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants