Fix Admin MFA required check #51618
Merged
Fix Admin MFA required check #51618
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
|
Should we lock the behavior in with test coverage? |
Joerger
added
the
no-changelog
Joerger
force-pushed
the
joerger/fix-admin-action-is-mfa-required-check
branch
from
f0d717f to
665c09b
Compare
greedy52
approved these changes
Jan 30, 2025
codingllama
reviewed
Jan 31, 2025
| @@ -9545,15 +9545,15 @@ func TestIsMFARequired_AdminAction(t *testing.T) { | |||
| name: "mfa verified", | |||
| adminActionAuthState: authz.AdminActionAuthMFAVerified, | |||
| expectResp: &proto.IsMFARequiredResponse{ | |||
| Required: false, | |||
| MFARequired: proto.MFARequired_MFA_REQUIRED_NO, | |||
| Required: true, | |||
There was a problem hiding this comment.
Do you think it's worth testing these using CreateAuthenticationChallenge instead? I've read the PR description a few times now but I confess I'm still a bit confused by it.
There was a problem hiding this comment.
CreateAuthenticateChallenge calls authWithRoles.IsMFARequired directly, so I think it's ok. I reorganized the PR description, hopefully the relation makes more sense now.
…om admin action mfa ceremony.
codingllama
approved these changes
Feb 3, 2025
public-teleport-github-review-bot
bot
removed the request for review
from zmb3
|
Since we aren't backporting #46891, I'll skip this backport as well. |
carloscastrojumo
pushed a commit
to carloscastrojumo/teleport
that referenced
this pull request
Feb 19, 2025
* Fix admin mfa required check. * Fix test. * Add client fallback mechanism by removing pre-existing mfa context from admin action mfa ceremony.
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.
The MFA required check for admin actions would take into account whether the
IsMFARequired(orCreateAuthenticationChallenge) request itself was admin-mfa-verified. This could potentially cause two problems:CreateAuthenticationChallengewill callIsMFARequiredand incorrectly think that it is already MFA verified.IsMFARequiredorCreateAuthenticationChallengeconsumes the MFA response and returns that MFA is not required.This PR changes
IsMFARequirednow just checks if Admin Action MFA is strictly not required - Whether because it's not enforced (totp allowed), disabled (TELEPORT_UNSTABLE_DISABLE_MFA_ADMIN_ACTIONS), or the identity asking is a built role.There are no bugs presently caused by this issue, but it is needed for some UX improvements like #46891.