Added support for additional OpenSSH compatibility flags. #46879
Conversation
github-actions
bot
added
size/md
tsh
Added support for OpenSSH compatibility flags for interactivity (-t and -T) and version information (-V). This is for customers that alias "ssh" to "tsh ssh".
russjones
force-pushed
the
rjones/openssh-interactive-flags
branch
from
696bf61
to
6223db1
Compare
| @@ -801,6 +845,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { | |||
| ssh.Flag("log-dir", "Directory to log separated command output, when executing on multiple nodes. If set, output from each node will also be labeled in the terminal.").StringVar(&cf.SSHLogDir) | |||
| ssh.Flag("no-resume", "Disable SSH connection resumption").Envar(noResumeEnvVar).BoolVar(&cf.DisableSSHResumption) | |||
| ssh.Flag("relogin", "Permit performing an authentication attempt on a failed command").Default("true").BoolVar(&cf.Relogin) | |||
| // The following flags are OpenSSH compatibility flags. They are not | |||
| // implemented in Kingpin but are registered here to inform developers that | |||
| // they are being used. Their behavior is implemented in 000000. | |||
There was a problem hiding this comment.
What is the 00000 meant to reference?
There was a problem hiding this comment.
Planning on putting the commit into this once I've pushed all changes.
tool/tsh/common/tsh.go
Outdated
| if slices.Contains(cmdline, "-V") { | ||
| modules.GetModules().PrintVersion() | ||
|
|
||
| return nil, &common.ExitCodeError{ | ||
| Code: 0, | ||
| } | ||
| } | ||
| i := slices.Index(cmdline, "-T") | ||
| if i > 0 { | ||
| cmdline = slices.Replace(cmdline, i, i+1, []string{"--no-tty"}...) | ||
| } |
There was a problem hiding this comment.
This won't handle short options grouped together in a single argument.
Kingpin's behavior already prohibits repeated short boolean flags AFAICT, so we could just have a secondary hidden flag for T and error out if both t and T are passed in (even though this would still technically be in violation of the OpenSSH cli api, since that follows "last option wins" instead).
There was a problem hiding this comment.
@espadolini That's how I originally implemented this feature. @zmb3 you were not a fan, what do you think?
I don't have strong feelings either way.
|
/excludeflake * |
Added support for OpenSSH compatibility flags for interactivity (
-tand-T) and version information (-V). This is for customers that aliassshtotsh ssh.changelog: Added support for
-t,-T, and-Vflags totshfor OpenSSH compatibility.