no server name override anymore

net/client_grpc.go

@@ -119,7 +119,7 @@ func (g *grpcClient) conn(p Peer) (*grpc.ClientConn, error) {
 			c, err = grpc.Dial(p.Address(), append(g.opts, grpc.WithInsecure())...)
 		} else {
 			pool := g.manager.Pool()
-			creds := credentials.NewClientTLSFromCert(pool, p.Address())
+			creds := credentials.NewClientTLSFromCert(pool, "")
 			opts := append(g.opts, grpc.WithTransportCredentials(creds))
 			c, err = grpc.Dial(p.Address(), opts...)
 		}

net/client_rest.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -82,9 +83,13 @@ func (r *restClient) doRequest(remote Peer, req *http.Request) ([]byte, error) {
 
 	pool := r.manager.Pool()
 	if remote.IsTLS() {
+		h, _, err := net.SplitHostPort(remote.Address())
+		if err != nil {
+			return nil, err
+		}
 		conf := &tls.Config{
 			RootCAs:    pool,
-			ServerName: remote.Address(),
+			ServerName: h,
 		}
 		client.Transport = &http.Transport{TLSClientConfig: conf}
 	}

net/gateway_test.go

@@ -2,6 +2,7 @@ package net
 
 import (
 	"context"
+	"net"
 	"os"
 	"path"
 	"testing"
@@ -78,7 +79,9 @@ func TestListenerTLS(t *testing.T) {
 	certPath := path.Join(tmpDir, "server.crt")
 	keyPath := path.Join(tmpDir, "server.key")
 	if httpscerts.Check(certPath, keyPath) != nil {
-		require.NoError(t, httpscerts.Generate(certPath, keyPath, addr1))
+		h, _, _ := net.SplitHostPort(addr1)
+		require.NoError(t, httpscerts.Generate(certPath, keyPath, h))
+		//require.NoError(t, httpscerts.Generate(certPath, keyPath, addr1))
 	}
 
 	service1 := &testService{42}