From 96ddac09ba1eff6b6cebd71b892c77e96f513424 Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Sun, 6 Jan 2019 18:37:23 +0000 Subject: [PATCH] fix return err when no port --- sshpiperd/upstream/provider.go | 2 +- .../upstream/workingdir/workingdir_test.go | 26 +++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sshpiperd/upstream/provider.go b/sshpiperd/upstream/provider.go index ef9b69d5..19a48bf0 100644 --- a/sshpiperd/upstream/provider.go +++ b/sshpiperd/upstream/provider.go @@ -79,7 +79,7 @@ func SplitHostPortForSSH(addr string) (host string, port int, err error) { } } else if host != "" { // test valid after concat :22 - if _, _, err := net.SplitHostPort(host + ":22"); err == nil { + if _, _, err = net.SplitHostPort(host + ":22"); err == nil { port = 22 } } diff --git a/sshpiperd/upstream/workingdir/workingdir_test.go b/sshpiperd/upstream/workingdir/workingdir_test.go index f4625d4d..cdcd79ca 100644 --- a/sshpiperd/upstream/workingdir/workingdir_test.go +++ b/sshpiperd/upstream/workingdir/workingdir_test.go @@ -128,11 +128,14 @@ func TestParseUpstreamFile(t *testing.T) { { - addr, port, user, _ := parseUpstreamFile(` + addr, port, user, err := parseUpstreamFile(` a:123 `) + if err != nil { + t.Fatalf("should not return err: %v", err) + } if addr != "a" || port != 123 || user != "" { t.Fatalf("parse failed common with port") @@ -141,11 +144,15 @@ a:123 { - addr, port, user, _ := parseUpstreamFile(` + addr, port, user, err := parseUpstreamFile(` a:123 b:456 `) + if err != nil { + t.Fatalf("should not return err: %v", err) + } + if addr != "a" || port != 123 || user != "" { t.Fatalf("parse multi line") } @@ -153,9 +160,12 @@ b:456 { - addr, port, user, _ := parseUpstreamFile(` + addr, port, user, err := parseUpstreamFile(` host `) + if err != nil { + t.Fatalf("should not return err: %v", err) + } if addr != "host" || port != 22 || user != "" { t.Fatalf("parse no port") @@ -164,9 +174,12 @@ host { - addr, port, user, _ := parseUpstreamFile(` + addr, port, user, err := parseUpstreamFile(` user@github.com `) + if err != nil { + t.Fatalf("should not return err: %v", err) + } if addr != "github.com" || port != 22 || user != "user" { t.Fatalf("parse no port with user") @@ -184,13 +197,16 @@ user@github.com { - addr, port, user, _ := parseUpstreamFile(` + addr, port, user, err := parseUpstreamFile(` # comment user@github.com test@linode.com `) + if err != nil { + t.Fatalf("should not return err: %v", err) + } if addr != "github.com" || port != 22 || user != "user" { t.Fatalf("multi line with comment") }