opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

interop: use credentials.NewTLS() when possible (#4390)

Browse Source
This commit is contained in:
Easwar Swaminathan
2021-05-12 10:17:13 -07:00
committed by GitHub
parent a95a5c3bac
commit aa59641d5d
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
interop/client/client.go
View File

@ -20,7 +20,10 @@
package main
import (
"crypto/tls"
"crypto/x509"
"flag"
"io/ioutil"
"net"
"strconv"
@ -57,7 +60,7 @@ var (
serverHost = flag.String("server_host", "localhost", "The server host name")
serverPort = flag.Int("server_port", 10000, "The server port number")
serviceConfigJSON = flag.String("service_config_json", "", "Disables service config lookups and sets the provided string as the default service config.")
tlsServerName = flag.String("server_host_override", "", "The server name use to verify the hostname returned by TLS handshake if it is not empty. Otherwise, --server_host is used.")
tlsServerName = flag.String("server_host_override", "", "The server name used to verify the hostname returned by TLS handshake if it is not empty. Otherwise, --server_host is used.")
testCase = flag.String("test_case", "large_unary",
`Configure different test cases. Valid options are:
empty_unary : empty (zero bytes) request and response;
@ -135,22 +138,25 @@ func main() {
var opts []grpc.DialOption
switch credsChosen {
case credsTLS:
var sn string
if *tlsServerName != "" {
sn = *tlsServerName
}
var creds credentials.TransportCredentials
var roots *x509.CertPool
if *testCA {
var err error
if *caFile == "" {
*caFile = testdata.Path("ca.pem")
}
creds, err = credentials.NewClientTLSFromFile(*caFile, sn)
b, err := ioutil.ReadFile(*caFile)
if err != nil {
logger.Fatalf("Failed to create TLS credentials %v", err)
logger.Fatalf("Failed to read root certificate file %q: %v", *caFile, err)
}
roots = x509.NewCertPool()
if !roots.AppendCertsFromPEM(b) {
logger.Fatalf("Failed to append certificates: %s", string(b))
}
}
var creds credentials.TransportCredentials
if *tlsServerName != "" {
creds = credentials.NewClientTLSFromCert(roots, *tlsServerName)
} else {
creds = credentials.NewClientTLSFromCert(nil, sn)
creds = credentials.NewTLS(&tls.Config{RootCAs: roots})
}
opts = append(opts, grpc.WithTransportCredentials(creds))
case credsALTS: