feat: Add SSH options (-o param) support

sikalabs · Jun 25, 2023 · 801fd19 · 801fd19
1 parent a155d44
commit 801fd19
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -9,6 +9,7 @@ type ConfigMeta struct {
 type ConfigHost struct {
 	SSHTarget    string                 `yaml:"ssh_target"`
 	SSHPassword  string                 `yaml:"ssh_password"`
+	SSHOptions   []string               `yaml:"ssh_options"`
 	SudoPassword string                 `yaml:"sudo_password"`
 	Vars         map[string]interface{} `yaml:"vars"`
 }

diff --git a/pkg/libtask/libtask.go b/pkg/libtask/libtask.go
@@ -3,6 +3,7 @@ package libtask
 type TaskInput struct {
 	SSHTarget               string
 	SSHPassword             string
+	SSHOptions              []string
 	NoStrictHostKeyChecking bool
 	Sudo                    bool
 	SudoPassword            string

diff --git a/pkg/run/run.go b/pkg/run/run.go
@@ -116,6 +116,7 @@ func Run(
 					taskInput := libtask.TaskInput{
 						SSHTarget:               host.SSHTarget,
 						SSHPassword:             host.SSHPassword,
+						SSHOptions:              host.SSHOptions,
 						SudoPassword:            host.SudoPassword,
 						Config:                  c,
 						NoStrictHostKeyChecking: c.Global.NoStrictHostKeyChecking,

diff --git a/pkg/utils/exec_utils/exec_utils.go b/pkg/utils/exec_utils/exec_utils.go
@@ -59,6 +59,9 @@ func SSH(taskInput libtask.TaskInput, cmdArray ...string) error {
 	if taskInput.NoStrictHostKeyChecking {
 		args = append([]string{"-o", "StrictHostKeyChecking=no"}, args...)
 	}
+	for _, option := range taskInput.SSHOptions {
+		args = append([]string{"-o", option}, args...)
+	}
 	if taskInput.SSHPassword != "" {
 		return Exec(taskInput, "sshpass", append([]string{"-p", taskInput.SSHPassword, "ssh"}, args...)...)
 	} else {