mfa: cancel TOTP prompt if U2F was used #6542
Merged
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
awly
force-pushed
the
andrew/totp-polish
branch
from
e6951d8 to
92d61ca
Compare
awly
force-pushed
the
andrew/totp-polish
branch
from
92d61ca to
2841f63
Compare
Joerger
approved these changes
Apr 28, 2021
r0mant
approved these changes
Apr 29, 2021
| return false, trace.WrapWithMessage(scan.Err(), "failed reading prompt response") | ||
| answer, err := in.ReadContext(ctx) | ||
| if err != nil { | ||
| return false, trace.WrapWithMessage(err, "failed reading prompt response") |
There was a problem hiding this comment.
Nit: This code is quite old but I think all "WrapWithMessage" calls here can be replaced with just regular "Wrap".
There was a problem hiding this comment.
Wrap just calls WrapWithMessage if there are any extra arguments.
I don't see any difference between them, other than a bit of overhead
awly
force-pushed
the
andrew/totp-polish
branch
from
2841f63 to
19b482f
Compare
Implement context-based cancellation in `/lib/utils/prompt`, for MFA prompts. This fixes the following scenario: ```sh User has both OTP and U2F devices registered. $ tsh mfa ls Name Type Added at Last used ----- ---- ----------------------------- ----------------------------- otp TOTP Wed, 21 Apr 2021 19:41:44 UTC Wed, 21 Apr 2021 19:44:32 UTC usb-a U2F Wed, 21 Apr 2021 19:44:34 UTC Wed, 21 Apr 2021 19:44:34 UTC Add a new OTP device, using existing U2F device: $ tsh mfa add Choose device type [TOTP, U2F]: totp Enter device name: otp2 Tap any *registered* security key or enter a code from a *registered* OTP device: <tap> # <- First OTP prompt here Open your TOTP app and create a new manual entry with these fields: Name: awly@localhost:3080 Issuer: Teleport Algorithm: SHA1 Number of digits: 6 Period: 30s Secret: 3UD42X2NN7EEZ6LUPG6NFMNOLDY6AJTS Once created, enter an OTP code generated by the app: 607738 # <- Second OTP prompt here MFA device "otp2" added. ``` Before this PR, the first OTP prompt (for `*registered* device`) would hang in the background. The OTP code from the newly-registered device is prompted later, but any text written ends up going to the first prompt. After this PR, the first prompt is canceled and the code from a new device goes to the second prompt as intended. Note: this is implemented using pure Go code (background goroutine consuming `os.Stdin`) rather than syscalls (e.g. `poll` or `select`) for portability.
awly
force-pushed
the
andrew/totp-polish
branch
from
19b482f to
e9b36be
Compare
awly
pushed a commit
that referenced
this pull request
Apr 29, 2021
Implement context-based cancellation in `/lib/utils/prompt`, for MFA prompts. This fixes the following scenario: ```sh User has both OTP and U2F devices registered. $ tsh mfa ls Name Type Added at Last used ----- ---- ----------------------------- ----------------------------- otp TOTP Wed, 21 Apr 2021 19:41:44 UTC Wed, 21 Apr 2021 19:44:32 UTC usb-a U2F Wed, 21 Apr 2021 19:44:34 UTC Wed, 21 Apr 2021 19:44:34 UTC Add a new OTP device, using existing U2F device: $ tsh mfa add Choose device type [TOTP, U2F]: totp Enter device name: otp2 Tap any *registered* security key or enter a code from a *registered* OTP device: <tap> # <- First OTP prompt here Open your TOTP app and create a new manual entry with these fields: Name: awly@localhost:3080 Issuer: Teleport Algorithm: SHA1 Number of digits: 6 Period: 30s Secret: 3UD42X2NN7EEZ6LUPG6NFMNOLDY6AJTS Once created, enter an OTP code generated by the app: 607738 # <- Second OTP prompt here MFA device "otp2" added. ``` Before this PR, the first OTP prompt (for `*registered* device`) would hang in the background. The OTP code from the newly-registered device is prompted later, but any text written ends up going to the first prompt. After this PR, the first prompt is canceled and the code from a new device goes to the second prompt as intended. Note: this is implemented using pure Go code (background goroutine consuming `os.Stdin`) rather than syscalls (e.g. `poll` or `select`) for portability.
awly
pushed a commit
that referenced
this pull request
May 3, 2021
Implement context-based cancellation in `/lib/utils/prompt`, for MFA prompts. This fixes the following scenario: ```sh User has both OTP and U2F devices registered. $ tsh mfa ls Name Type Added at Last used ----- ---- ----------------------------- ----------------------------- otp TOTP Wed, 21 Apr 2021 19:41:44 UTC Wed, 21 Apr 2021 19:44:32 UTC usb-a U2F Wed, 21 Apr 2021 19:44:34 UTC Wed, 21 Apr 2021 19:44:34 UTC Add a new OTP device, using existing U2F device: $ tsh mfa add Choose device type [TOTP, U2F]: totp Enter device name: otp2 Tap any *registered* security key or enter a code from a *registered* OTP device: <tap> # <- First OTP prompt here Open your TOTP app and create a new manual entry with these fields: Name: awly@localhost:3080 Issuer: Teleport Algorithm: SHA1 Number of digits: 6 Period: 30s Secret: 3UD42X2NN7EEZ6LUPG6NFMNOLDY6AJTS Once created, enter an OTP code generated by the app: 607738 # <- Second OTP prompt here MFA device "otp2" added. ``` Before this PR, the first OTP prompt (for `*registered* device`) would hang in the background. The OTP code from the newly-registered device is prompted later, but any text written ends up going to the first prompt. After this PR, the first prompt is canceled and the code from a new device goes to the second prompt as intended. Note: this is implemented using pure Go code (background goroutine consuming `os.Stdin`) rather than syscalls (e.g. `poll` or `select`) for portability.
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.
Implement context-based cancellation in
/lib/utils/prompt, for MFAprompts.
This fixes the following scenario:
Before this PR, the first OTP prompt (for
*registered* device) wouldhang in the background. The OTP code from the newly-registered device is
prompted later, but any text written ends up going to the first prompt and lost.
After this PR, the first prompt is canceled and the code from a new
device goes to the second prompt as intended.
Note: this is implemented using pure Go code (background goroutine
consuming
os.Stdin) rather than syscalls (e.g.pollorselect)for portability.
Fixes #5804
Updates #5878