net/smtp: NewClient: set tls field to true when already using a TLS connection

Change-Id: I34008f56c191df0edcaafc20d569bbc6184f89fc
Reviewed-on: https://go-review.googlesource.com/68470
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/smtp/smtp.go b/src/net/smtp/smtp.go
index ab457d3f9571037f4bc4d6b6b0607d0ee24b9124..bf574aece1cfd15a70da3ede344c6a47df4c98c6 100644 (file)
--- a/src/net/smtp/smtp.go
+++ b/src/net/smtp/smtp.go
@@ -67,6 +67,7 @@ func NewClient(conn net.Conn, host string) (*Client, error) {
                return nil, err
        }
        c := &Client{Text: text, conn: conn, serverName: host, localName: "localhost"}
+       _, c.tls = conn.(*tls.Conn)
        return c, nil
 }
 

diff --git a/src/net/smtp/smtp_test.go b/src/net/smtp/smtp_test.go
index e4549d251e95147f5ed99801c26066d276f79749..9e7ed78f3655faed89417431956e7c6687999113 100644 (file)
--- a/src/net/smtp/smtp_test.go
+++ b/src/net/smtp/smtp_test.go
@@ -373,6 +373,53 @@ HELO localhost
 QUIT
 `
 
+func TestNewClientWithTLS(t *testing.T) {
+       cert, err := tls.X509KeyPair(localhostCert, localhostKey)
+       if err != nil {
+               t.Fatalf("loadcert: %v", err)
+       }
+
+       config := tls.Config{Certificates: []tls.Certificate{cert}}
+
+       ln, err := tls.Listen("tcp", "127.0.0.1:0", &config)
+       if err != nil {
+               ln, err = tls.Listen("tcp", "[::1]:0", &config)
+               if err != nil {
+                       t.Fatalf("server: listen: %s", err)
+               }
+       }
+
+       go func() {
+               conn, err := ln.Accept()
+               if err != nil {
+                       t.Fatalf("server: accept: %s", err)
+                       return
+               }
+               defer conn.Close()
+
+               _, err = conn.Write([]byte("220 SIGNS\r\n"))
+               if err != nil {
+                       t.Fatalf("server: write: %s", err)
+                       return
+               }
+       }()
+
+       config.InsecureSkipVerify = true
+       conn, err := tls.Dial("tcp", ln.Addr().String(), &config)
+       if err != nil {
+               t.Fatalf("client: dial: %s", err)
+       }
+       defer conn.Close()
+
+       client, err := NewClient(conn, ln.Addr().String())
+       if err != nil {
+               t.Fatalf("smtp: newclient: %s", err)
+       }
+       if !client.tls {
+               t.Errorf("client.tls Got: %t Expected: %t", client.tls, true)
+       }
+}
+
 func TestHello(t *testing.T) {
 
        if len(helloServer) != len(helloClient) {