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 double dash delimiter in tsh ssh #46441

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Conversation

rosstimothy
Copy link
Contributor

@rosstimothy rosstimothy commented Sep 10, 2024

Buddies #43897

Originally contributed by @ns-sjorgedeaguiar

Closes #18453 and #16589.

changelog: Update tsh ssh to support the -- delimiter similar to openssh. It is now possible to execute a command via tsh ssh user@host -- echo test or tsh ssh -- host uptime

@rosstimothy rosstimothy marked this pull request as ready for review September 11, 2024 13:10
@github-actions github-actions bot added size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Sep 11, 2024
Copy link
Contributor

@espadolini espadolini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does that allow tsh ssh -- hostname? That's explicitly allowed in OpenSSH ssh.

@rosstimothy
Copy link
Contributor Author

Does that allow tsh ssh -- hostname? That's explicitly allowed in OpenSSH ssh.

Yes. I'll add a test case for that as well.

$ ./build/tsh ssh -- server01 uptime
12:51  up 5 days, 20:41, 6 users, load averages: 1.97 1.96 1.87
$ ./build/tsh ssh tim@server01 -- echo "testing 123"
testing 123
$ ./build/tsh ssh server01 -- echo "testing 123"
testing 123

This PR extends the tsh ssh command by adding support for the
double dash (--) delimiter before remote commands (e.g.
`tsh ssh -- echo test`), aligning its behavior with the standard
ssh binary. This improves compatibility with tools that rely on the
standard ssh binary behavior, such as sshuttle.

Fixes #18453, #16589.

Signed-off-by: Tim Ross <tim.ross@goteleport.com>
This PR extends the tsh ssh command by adding support for the
double dash (--) delimiter before remote commands (e.g.
`tsh ssh -- echo test`), aligning its behavior with the standard
ssh binary. This improves compatibility with tools that rely on the
standard ssh binary behavior, such as sshuttle.

Fixes #18453, #16589.

Signed-off-by: Tim Ross <tim.ross@goteleport.com>
@rosstimothy rosstimothy linked an issue Sep 11, 2024 that may be closed by this pull request
@rosstimothy rosstimothy added this pull request to the merge queue Sep 11, 2024
Merged via the queue into master with commit c131225 Sep 11, 2024
42 checks passed
@rosstimothy rosstimothy deleted the tross/pr-buddy-43897 branch September 11, 2024 20:20
@public-teleport-github-review-bot

@rosstimothy See the table below for backport results.

Branch Result
branch/v14 Create PR
branch/v15 Create PR
branch/v16 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v14 backport/branch/v15 backport/branch/v16 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.

sshuttle cannot be used with tsh tsh: Double dash no longer works
4 participants