Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move port check to scanHostKey func

Browse Source
This commit is contained in:
Hidde Beydals
2020-06-09 12:42:37 +02:00
parent 9099ad3d8b
commit 65cfa6d347
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/tk/create_source_git.go
View File

@@ -140,11 +140,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
}
logAction("collecting preferred public key from SSH server")
host := u.Host
if u.Port() == "" {
host = host + ":22"
}
hostKey, err := scanHostKey(ctx, host)
hostKey, err := scanHostKey(ctx, u)
if err != nil {
return err
}
@@ -269,7 +265,11 @@ func generateKeyPair(ctx context.Context) (*ssh.KeyPair, error) {
return pair, nil
}
func scanHostKey(ctx context.Context, host string) ([]byte, error) {
func scanHostKey(ctx context.Context, url *url.URL) ([]byte, error) {
host := url.Host
if url.Port() == "" {
host = host + ":22"
}
hostKey, err := ssh.ScanHostKey(host, 30*time.Second)
if err != nil {
return nil, fmt.Errorf("SSH key scan for host '%s' failed: %w", host, err)