fix: Set the security-key hint when using cross-platform mode on Windows#62105
Merged
codingllama merged 4 commits intomasterfrom Dec 10, 2025
Merged
fix: Set the security-key hint when using cross-platform mode on Windows#62105codingllama merged 4 commits intomasterfrom
codingllama merged 4 commits intomasterfrom
Conversation
zmb3
approved these changes
Dec 9, 2025
rosstimothy
approved these changes
Dec 9, 2025
public-teleport-github-review-bot
bot
removed request for
marcoandredinis and
smallinsky
Contributor
Author
|
Thanks for the quick reviews! |
Contributor
|
@codingllama See the table below for backport results.
|
codingllama
added a commit
that referenced
this pull request
Dec 10, 2025
…ows (#62105) * Update WEBAUTHN_AUTHENTICATOR_GET_ASSERTION_OPTIONS to version 9 * Set the security-key hint when using cross-platform mode on Windows * Appease linter * Fix tests
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 11, 2025
…n Windows (#62136) * Convert lib/auth/webauthn* to use slog (#50510) (partial) * fix: Set the security-key hint when using cross-platform mode on Windows (#62105) * Update WEBAUTHN_AUTHENTICATOR_GET_ASSERTION_OPTIONS to version 9 * Set the security-key hint when using cross-platform mode on Windows * Appease linter * Fix tests --------- Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
21KennethTran
pushed a commit
that referenced
this pull request
Jan 6, 2026
…ows (#62105) * Update WEBAUTHN_AUTHENTICATOR_GET_ASSERTION_OPTIONS to version 9 * Set the security-key hint when using cross-platform mode on Windows * Appease linter * Fix tests
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 WebAuthn "cross-platform" authenticator attachment has evolved over time to include both physical security keys and phones. tsh uses WebAuthn.dll on Windows, which over time has adopted the new interpretation and now prompts for both security keys and phones on "cross-platform" mode (see screenshot on #62060). This is a regression of sorts for tsh, which has always equated cross-platform to security keys (and doesn't even support phones on various platforms).
This fixes the issue by updating the corresponding WebAuthn.dll structs to v9 and setting the credential hint "security-key" when using cross-platform mode.
Note that all of this is specific to users running
tsh --mfa-mode=cross-platform <command>(or equivalent). Other flows are unfiltered, meaning all options are there by default.#62060
Changelog: Changed "tsh --mfa-mode=cross-platform" to favor security keys on current Windows versions