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

Support AddKeysToAgent in Connect #47270

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Support AddKeysToAgent in Connect #47270

merged 2 commits into from
Oct 7, 2024

Conversation

ravicious
Copy link
Member

There's a certain class of bugs which seems to boil down to tsh attempting to add certs to a local agent when it shouldn't (see #3169 (comment) and #11662). In tsh, it's possible to provide the --add-keys-to-agent no option when logging in. In Connect, there's no way to control this behavior.

This PR adds sshAgent.addKeysToAgent. The sshAgent prefix was used instead of ssh as this config option does not pertain to SSH connections themselves but rather to how tsh interacts with a local SSH agent.

I verified that this works by setting the option to "no" and then verifying that tshd shows the following line during login:

TSHD DEBU [CLIENT]    Skipping connection to the local ssh-agent. client/keyagent.go:139

changelog: Added a config option to Teleport Connect to control how it interacts with the local SSH agent (sshAgent.addKeysToAgent)

@github-actions github-actions bot added size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ui labels Oct 7, 2024
@github-actions github-actions bot requested a review from avatus October 7, 2024 14:11
Copy link

github-actions bot commented Oct 7, 2024

🤖 Vercel preview here: https://docs-ftdgq2to7-goteleport.vercel.app/docs/ver/preview

@ravicious ravicious added this pull request to the merge queue Oct 7, 2024
Merged via the queue into master with commit 225da7b Oct 7, 2024
44 checks passed
@ravicious ravicious deleted the r7s/add-key-to-agent branch October 7, 2024 16:55
@public-teleport-github-review-bot

@ravicious See the table below for backport results.

Branch Result
branch/v15 Failed
branch/v16 Failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v15 backport/branch/v16 size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ui
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants