ssh: return missing user field in NewClientConn
Fix golang/go#45249
Change-Id: I27ef2976586ad481d832c6e46695a91f1bb50373
GitHub-Last-Rev: 9f631b80925719a0fb77576f7983cd7c8d0b5056
GitHub-Pull-Request: golang/crypto#180
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/304990
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Katie Hockman <katie@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
Trust: Katie Hockman <katie@golang.org>
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/ssh/client.go b/ssh/client.go
index 7b00bff..99f68bd 100644
--- a/ssh/client.go
+++ b/ssh/client.go
@@ -77,7 +77,7 @@
}
conn := &connection{
- sshConn: sshConn{conn: c},
+ sshConn: sshConn{conn: c, user: fullConf.User},
}
if err := conn.clientHandshake(addr, &fullConf); err != nil {
diff --git a/ssh/client_test.go b/ssh/client_test.go
index 81f9599..6aaa003 100644
--- a/ssh/client_test.go
+++ b/ssh/client_test.go
@@ -164,3 +164,52 @@
t.Fatalf("got %s; want %s", receivedBanner, expected)
}
}
+
+func TestNewClientConn(t *testing.T) {
+ for _, tt := range []struct {
+ name string
+ user string
+ }{
+ {
+ name: "good user field for ConnMetadata",
+ user: "testuser",
+ },
+ {
+ name: "empty user field for ConnMetadata",
+ user: "",
+ },
+ } {
+ t.Run(tt.name, func(t *testing.T) {
+ c1, c2, err := netPipe()
+ if err != nil {
+ t.Fatalf("netPipe: %v", err)
+ }
+ defer c1.Close()
+ defer c2.Close()
+
+ serverConf := &ServerConfig{
+ PasswordCallback: func(conn ConnMetadata, password []byte) (*Permissions, error) {
+ return &Permissions{}, nil
+ },
+ }
+ serverConf.AddHostKey(testSigners["rsa"])
+ go NewServerConn(c1, serverConf)
+
+ clientConf := &ClientConfig{
+ User: tt.user,
+ Auth: []AuthMethod{
+ Password("testpw"),
+ },
+ HostKeyCallback: InsecureIgnoreHostKey(),
+ }
+ clientConn, _, _, err := NewClientConn(c2, "", clientConf)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ if userGot := clientConn.User(); userGot != tt.user {
+ t.Errorf("got user %q; want user %q", userGot, tt.user)
+ }
+ })
+ }
+}