astelm
/
grpcurl
mirror of https://github.com/fullstorydev/grpcurl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: Joshua Humphries <jh@fullstory.com>
This commit is contained in:
Igor 2021-09-20 17:39:16 +02:00 committed by GitHub
parent afb789f147
commit 645a53904f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/grpcurl/grpcurl.go
View File

@ -410,13 +410,14 @@ func main() {
if !*plaintext { if !*plaintext {
tlsConf, err := grpcurl.ClientTLSConfig(*insecure, *cacert, *cert, *key) tlsConf, err := grpcurl.ClientTLSConfig(*insecure, *cacert, *cert, *key)
if err != nil { if err != nil {
fail(err, "Failed to configure TLS config") fail(err, "Failed to create TLS config")
} }
if os.Getenv("SSLKEYLOGFILE") != "" { sslKeylogFile := os.Getenv("SSLKEYLOGFILE")
w, err := os.OpenFile(os.Getenv("SSLKEYLOGFILE"), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600) if sslKeylogFile != "" {
w, err := os.OpenFile(sslKeylogFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600)
if err != nil { if err != nil {
fail(err, "Could not open SSLKEYLOGFILE: %v") fail(err, "Could not open SSLKEYLOGFILE %s", sslKeylogFile)
} }
tlsConf.KeyLogWriter = w tlsConf.KeyLogWriter = w
} }

10
grpcurl.go
View File

@ -508,9 +508,11 @@ func makeTemplate(md *desc.MessageDescriptor, path []*desc.MessageDescriptor) pr
return dm return dm
} }
// ClientTransportCredentials is a thin wrapper around ClientTLSConfig, kept for BC. // ClientTransportCredentials is a helper function that constructs a TLS config with
// ClientTLSConfig offers more flexibility, as the caller can customize the tls.Config // the given properties (see ClientTLSConfig) and then constructs and returns gRPC
// struct. // transport credentials using that config.
//
// Deprecated: Use grpcurl.ClientTLSConfig and credentials.NewTLS instead.
func ClientTransportCredentials(insecureSkipVerify bool, cacertFile, clientCertFile, clientKeyFile string) (credentials.TransportCredentials, error) { func ClientTransportCredentials(insecureSkipVerify bool, cacertFile, clientCertFile, clientKeyFile string) (credentials.TransportCredentials, error) {
tlsConf, err := ClientTLSConfig(insecureSkipVerify, cacertFile, clientCertFile, clientKeyFile) tlsConf, err := ClientTLSConfig(insecureSkipVerify, cacertFile, clientCertFile, clientKeyFile)
if err != nil { if err != nil {
@ -520,7 +522,7 @@ func ClientTransportCredentials(insecureSkipVerify bool, cacertFile, clientCertF
return credentials.NewTLS(tlsConf), nil return credentials.NewTLS(tlsConf), nil
} }
// ClientTLSConfig builds transport credentials for a gRPC client using the // ClientTLSConfig builds transport-layer config for a gRPC client using the
// given properties. If cacertFile is blank, only standard trusted certs are used to // given properties. If cacertFile is blank, only standard trusted certs are used to
// verify the server certs. If clientCertFile is blank, the client will not use a client // verify the server certs. If clientCertFile is blank, the client will not use a client
// certificate. If clientCertFile is not blank then clientKeyFile must not be blank. // certificate. If clientCertFile is not blank then clientKeyFile must not be blank.