engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix return err when no port

Browse source
This commit is contained in:
Boshi Lian 2019-01-06 18:37:23 +00:00
parent c237ce1067
commit 96ddac09ba
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sshpiperd/upstream/provider.go
View file

@ -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
}
}

26
sshpiperd/upstream/workingdir/workingdir_test.go
View file

@ -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")
}