Merge pull request #8224 from yousong/automated-cherry-pick-of-#8222-upstream-release-2.13

Automated cherry pick of #8222: webconsole: ssh: each argument on its own line
This commit is contained in:
yunion-ci-robot
2020-10-10 16:09:18 +08:00
committed by GitHub

View File

@@ -156,8 +156,11 @@ func (c *SSHtoolSol) GetData(data string) (isShow bool, ouput string, command st
args := []string{
o.Options.SshpassToolPath, "-p", data,
o.Options.SshToolPath, "-p", fmt.Sprintf("%d", c.Port), fmt.Sprintf("%s@%s", c.Username, c.IP),
"-oGlobalKnownHostsFile=/dev/null", "-oUserKnownHostsFile=/dev/null", "-oStrictHostKeyChecking=no",
"-oPreferredAuthentications=password", "-oPubkeyAuthentication=no", //密码登录时,避免搜寻秘钥登录
"-oGlobalKnownHostsFile=/dev/null",
"-oUserKnownHostsFile=/dev/null",
"-oStrictHostKeyChecking=no",
"-oPreferredAuthentications=password,keyboard-interactive",
"-oPubkeyAuthentication=no", //密码登录时,避免搜寻秘钥登录
}
return true, "", strings.Join(args, " ")
}