jkaninda/go-storage
1
0
Fork 0
mirror of https://github.com/jkaninda/go-storage.git synced 2025-12-08 01:29:38 +01:00
Code Issues Actions Projects Releases Wiki Activity

Fix ssh identityfile

Browse Source
This commit is contained in:
Jonas Kaninda
2024-12-07 19:44:57 +01:00
parent 793b04340e
commit 085bdf468f
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/ssh/ssh.go
View File

@@ -46,7 +46,7 @@ type Config struct {
Host string
User string
Password string
Port string
Port int
IdentifyFile string
LocalPath string
RemotePath string
@@ -54,15 +54,15 @@ type Config struct {
// createClient creates SSH Client
func createClient(conf Config) (scp.Client, error) {
if _, err := os.Stat(conf.IdentifyFile); os.IsNotExist(err) {
if _, err := os.Stat(conf.IdentifyFile); !os.IsNotExist(err) {
clientConfig, err := auth.PrivateKey(conf.User, conf.IdentifyFile, ssh.InsecureIgnoreHostKey())
return scp.NewClient(fmt.Sprintf("%s:%s", conf.Host, conf.Port), &clientConfig), err
return scp.NewClient(fmt.Sprintf("%s:%d", conf.Host, conf.Port), &clientConfig), err
} else {
if conf.Password == "" {
return scp.Client{}, errors.New("ssh password required")
}
clientConfig, err := auth.PasswordKey(conf.User, conf.Password, ssh.InsecureIgnoreHostKey())
return scp.NewClient(fmt.Sprintf("%s:%s", conf.Host, conf.Port), &clientConfig), err
return scp.NewClient(fmt.Sprintf("%s:%d", conf.Host, conf.Port), &clientConfig), err
}
}

1
pkg/ssh/ssh_test.go Normal file
View File

@@ -0,0 +1 @@
package ssh