Skip to content

[v16] fix: Always prompt if multiple MFA methods are running#47154

Merged
codingllama merged 1 commit intobranch/v16from
codingllama/backport/47114-v16
Oct 7, 2024
Merged

[v16] fix: Always prompt if multiple MFA methods are running#47154
codingllama merged 1 commit intobranch/v16from
codingllama/backport/47114-v16

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

Backport #47114 to branch/v16.

#43072

Changelog: Fix missing tsh MFA prompt in certain OTP+WebAuthn scenarios

@github-actions github-actions Bot added backport size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Oct 3, 2024
@codingllama
Copy link
Copy Markdown
Contributor Author

Conflicts on lib/client/mfa.go and tool/tsh/common/mfa.go, but nothing noteworthy - it's mostly git getting confused about unrelated new blocks on master.

@codingllama codingllama enabled auto-merge October 3, 2024 19:51
@codingllama codingllama added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@marcoandredinis marcoandredinis added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@marcoandredinis marcoandredinis added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@codingllama codingllama added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@codingllama codingllama added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@codingllama codingllama added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@codingllama codingllama added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
* fix: Always prompt if multiple MFA methods are running

* Fix deadlock on OTP+WebAuthn+PIN prompts

* Fix races on wanwin.PromptPlatformMessage
@codingllama codingllama force-pushed the codingllama/backport/47114-v16 branch from ef4f74a to 1bee4f2 Compare October 7, 2024 15:17
@codingllama codingllama enabled auto-merge October 7, 2024 15:17
@codingllama codingllama added this pull request to the merge queue Oct 7, 2024
Merged via the queue into branch/v16 with commit 7ad25b5 Oct 7, 2024
@codingllama codingllama deleted the codingllama/backport/47114-v16 branch October 7, 2024 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants