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.

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

fix: Explicitly mention OTPs on tsh/Windows logins #30302

Merged
merged 1 commit into from Aug 14, 2023

Conversation

codingllama
Copy link
Contributor

@codingllama codingllama commented Aug 10, 2023

Explicitly mention OTPs, when running tsh login on Windows, if the user has both OTP and WebAuthn registered.

"Platform" logins, like Windows WebAuthn, do not use the "normal" MFA prompts. This makes sense, as the OS shows its own dialogs. In the case of Touch ID we know the login will succeed, so it just takes over. For Windows, less so.

This customizes the Windows prompt when OTP and WebAuthn are possible. Note that the Windows platform prompt is a modal and must be canceled before the OTP is entered, that's why the message says "enter the code here".

Example:

$ tsh.exe login #(...)
> Enter password for Teleport user llama:
> Follow the OS dialogs for platform authentication, or enter an OTP code here:
*ESC to cancel modal*
*type OTP, enter*
> Profile URL: (...)

#25051

@codingllama
Copy link
Contributor Author

Friendly ping @zmb3 or @ravicious ?

@codingllama codingllama added this pull request to the merge queue Aug 12, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 12, 2023
@codingllama codingllama added this pull request to the merge queue Aug 14, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 14, 2023
@codingllama codingllama added this pull request to the merge queue Aug 14, 2023
@codingllama codingllama removed this pull request from the merge queue due to a manual request Aug 14, 2023
@codingllama codingllama added this pull request to the merge queue Aug 14, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 14, 2023
@codingllama codingllama added this pull request to the merge queue Aug 14, 2023
Merged via the queue into master with commit abd19d1 Aug 14, 2023
22 checks passed
@codingllama codingllama deleted the codingllama/win-otp branch August 14, 2023 16:19
@public-teleport-github-review-bot

@codingllama See the table below for backport results.

Branch Result
branch/v11 Create PR
branch/v12 Create PR
branch/v13 Create PR

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.

None yet

4 participants