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

advancedtls: use grpc 1.27.0 and small fixes (#3360)

Browse Source
This commit is contained in:
ZhenLian
2020-02-04 12:46:21 -08:00
committed by GitHub
parent 3ae60ebf74
commit 648cf9b00e
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
security/advancedtls/advancedtls.go
View File

@ -207,7 +207,13 @@ func (c *advancedTLSCreds) ClientHandshake(ctx context.Context, authority string
conn.Close()
return nil, nil, ctx.Err()
}
return WrapSyscallConn(rawConn, conn), credentials.TLSInfo{State: conn.ConnectionState()}, nil
info := credentials.TLSInfo{
State: conn.ConnectionState(),
CommonAuthInfo: credentials.CommonAuthInfo{
SecurityLevel: credentials.PrivacyAndIntegrity,
},
}
return WrapSyscallConn(rawConn, conn), info, nil
}
func (c *advancedTLSCreds) ServerHandshake(rawConn net.Conn) (net.Conn, credentials.AuthInfo, error) {
@ -221,7 +227,13 @@ func (c *advancedTLSCreds) ServerHandshake(rawConn net.Conn) (net.Conn, credenti
conn.Close()
return nil, nil, err
}
return WrapSyscallConn(rawConn, conn), credentials.TLSInfo{State: conn.ConnectionState()}, nil
info := credentials.TLSInfo{
State: conn.ConnectionState(),
CommonAuthInfo: credentials.CommonAuthInfo{
SecurityLevel: credentials.PrivacyAndIntegrity,
},
}
return WrapSyscallConn(rawConn, conn), info, nil
}
func (c *advancedTLSCreds) Clone() credentials.TransportCredentials {

9
security/advancedtls/advancedtls_integration_test.go
View File

@ -172,7 +172,10 @@ func callAndVerifyWithClientConn(connCtx context.Context, msg string, creds cred
// (could be change the client's trust certificate, or change server authorization function, etc)
func TestEnd2End(t *testing.T) {
cs := &certStore{}
cs.loadCerts()
err := cs.loadCerts()
if err != nil {
t.Fatalf("failed to load certs: %v", err)
}
stage := &stageInfo{}
for _, test := range []struct {
desc string
@ -330,7 +333,7 @@ func TestEnd2End(t *testing.T) {
}
serverTLSCreds, err := NewServerCreds(serverOptions)
if err != nil {
t.Fatalf("Failed to create server creds: %v", err)
t.Fatalf("failed to create server creds: %v", err)
}
s := grpc.NewServer(grpc.Creds(serverTLSCreds))
defer s.Stop()
@ -338,7 +341,7 @@ func TestEnd2End(t *testing.T) {
lis, err := net.Listen("tcp", port)
// defer lis.Close()
if err != nil {
t.Fatalf("Failed to listen: %v", err)
t.Fatalf("failed to listen: %v", err)
}
pb.RegisterGreeterServer(s, &serverImpl{})
if err := s.Serve(lis); err != nil {

2
security/advancedtls/go.mod
View File

@ -2,4 +2,4 @@ module google.golang.org/grpc/security/advancedtls
go 1.13
require google.golang.org/grpc v1.26.0
require google.golang.org/grpc v1.27.0

2
security/advancedtls/go.sum
View File

@ -47,5 +47,7 @@ google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=