Support AddKeysToAgent
in Connect
#47270
Merged
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.
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
. ThesshAgent
prefix was used instead ofssh
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:changelog: Added a config option to Teleport Connect to control how it interacts with the local SSH agent (
sshAgent.addKeysToAgent
)