Fix 2FA challenge and password challenge for non-database users #11831
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
How did this break PAM authentication... |
Gargron
commented
Sep 14, 2019
Gargron
changed the title
ClearlyClaire
approved these changes
Sep 15, 2019
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
…odon#11831) * Fix 2FA challenge not appearing for non-database users Fix mastodon#11685 * Fix account deletion not working when using external login Fix mastodon#11691
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #11685
Previous code (inspired by GitLab) handled 2FA before Devise performed its own authentication, duplicating the work, and, in case of non-database users (LDAP, PAM), doing the wrong kind of work. Now authentication is delegated to Devise/Warden, then once we have the user, we check the 2FA requirement, and handle OTP/recovery token.
Fix #11691
It is not possible to re-authenticate non-database users just from password input when confirming account deletion. So, for those users, use a simple username repetition challenge instead of confirming password.