Skip to content

[v17] Do not require user interaction in tsh status when using hardware keys #48837

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.

Sign up for GitHub

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

Merged
gzdunek merged 1 commit into from
Nov 13, 2024
Merged

[v17] Do not require user interaction in tsh status when using hardware keys #48837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions tool/tsh/common/tsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4867,7 +4867,18 @@ func onStatus(cf *CLIConf) error {
return trace.Wrap(err)
}

if err := printLoginInformation(cf, profile, profiles, cf.getAccessListsToReview(tc)); err != nil {
// `tsh status` should run without requiring user interaction.
// To achieve this, we avoid remote calls that might prompt for
// hardware key touch or require a PIN.
hardwareKeyInteractionRequired := tc.PrivateKeyPolicy.MFAVerified()

var accessListsToReview []*accesslist.AccessList
if hardwareKeyInteractionRequired {
log.Debug("Skipping fetching access lists to review due to Hardware Key PIN/Touch requirement.")
} else {
accessListsToReview = cf.getAccessListsToReview(tc)
}
if err := printLoginInformation(cf, profile, profiles, accessListsToReview); err != nil {
return trace.Wrap(err)
}

Expand All @@ -4880,7 +4891,7 @@ func onStatus(cf *CLIConf) error {
return trace.NotFound("Active profile expired.")
}

if tc.PrivateKeyPolicy.MFAVerified() {
if hardwareKeyInteractionRequired {
log.Debug("Skipping cluster alerts due to Hardware Key PIN/Touch requirement.")
} else {
if err := common.ShowClusterAlerts(cf.Context, tc, os.Stderr, nil,
Expand Down