mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-18 22:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle invalid args and passthrough

Browse Source
This commit is contained in:
Kovid Goyal
2023-02-20 17:56:54 +05:30
parent 06bfa671d9
commit 3f829ccdde
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/cmd/ssh/utils.go
View File

@@ -16,6 +16,18 @@ var _ = fmt.Print
var ssh_options map[string]string
var query_ssh_for_options_once sync.Once
func ssh_exe() string {
ans := utils.Which("ssh")
if ans != "" {
return ans
}
ans = utils.Which("ssh", "/usr/local/bin", "/opt/bin", "/opt/homebrew/bin", "/usr/bin", "/bin")
if ans == "" {
ans = "ssh"
}
return ans
}
func get_ssh_options() {
defer func() {
if ssh_options == nil {
@@ -30,7 +42,7 @@ func get_ssh_options() {
}
}
}()
cmd := exec.Command("ssh")
cmd := exec.Command(ssh_exe())
stderr, err := cmd.StderrPipe()
if err != nil {
return
@@ -111,6 +123,10 @@ func (self *ErrInvalidSSHArgs) Error() string {
return self.Msg
}
func PassthroughArgs() map[string]bool {
return map[string]bool{"-N": true, "-n": true, "-f": true, "-G": true, "-T": true}
}
func ParseSSHArgs(args []string, extra_args ...string) (ssh_args []string, server_args []string, passthrough bool, found_extra_args []string, err error) {
if extra_args == nil {
extra_args = []string{}
@@ -119,7 +135,7 @@ func ParseSSHArgs(args []string, extra_args ...string) (ssh_args []string, serve
passthrough = true
return
}
passthrough_args := map[string]bool{"-N": true, "-n": true, "-f": true, "-G": true, "-T": true}
passthrough_args := PassthroughArgs()
boolean_ssh_args, other_ssh_args := GetSSHCLI()
ssh_args, server_args, found_extra_args = make([]string, 0, 16), make([]string, 0, 16), make([]string, 0, 16)
expecting_option_val := false
@@ -184,8 +200,8 @@ func ParseSSHArgs(args []string, extra_args ...string) (ssh_args []string, serve
}
server_args = append(server_args, argument)
}
if len(server_args) == 0 {
err = &ErrInvalidSSHArgs{Msg: "No server to connect to specified"}
if len(server_args) == 0 && !passthrough {
err = &ErrInvalidSSHArgs{Msg: ""}
}
return
}