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

credentials/alts: Simplify ALTS acquire and release APIs (#3221)

Browse Source
This commit is contained in:
Cesar Ghali
2019-12-03 15:43:33 -08:00
committed by GitHub
parent 645dd12f13
commit 22854c88e0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
credentials/alts/internal/handshaker/handshaker.go
View File

@ -74,8 +74,10 @@ func init() {
} }
} }
func acquire(n int64) bool { func acquire() bool {
mu.Lock() mu.Lock()
// If we need n to be configurable, we can pass it as an argument.
n := int64(1)
success := maxPendingHandshakes-concurrentHandshakes >= n success := maxPendingHandshakes-concurrentHandshakes >= n
if success { if success {
concurrentHandshakes += n concurrentHandshakes += n
@ -84,8 +86,10 @@ func acquire(n int64) bool {
return success return success
} }
func release(n int64) { func release() {
mu.Lock() mu.Lock()
// If we need n to be configurable, we can pass it as an argument.
n := int64(1)
concurrentHandshakes -= n concurrentHandshakes -= n
if concurrentHandshakes < 0 { if concurrentHandshakes < 0 {
mu.Unlock() mu.Unlock()
@ -182,10 +186,10 @@ func NewServerHandshaker(ctx context.Context, conn *grpc.ClientConn, c net.Conn,
// ClientHandshake starts and completes a client ALTS handshaking for GCP. Once // ClientHandshake starts and completes a client ALTS handshaking for GCP. Once
// done, ClientHandshake returns a secure connection. // done, ClientHandshake returns a secure connection.
func (h *altsHandshaker) ClientHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error) { func (h *altsHandshaker) ClientHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error) {
if !acquire(1) { if !acquire() {
return nil, nil, errDropped return nil, nil, errDropped
} }
defer release(1) defer release()
if h.side != core.ClientSide { if h.side != core.ClientSide {
return nil, nil, errors.New("only handshakers created using NewClientHandshaker can perform a client handshaker") return nil, nil, errors.New("only handshakers created using NewClientHandshaker can perform a client handshaker")
@ -225,10 +229,10 @@ func (h *altsHandshaker) ClientHandshake(ctx context.Context) (net.Conn, credent
// ServerHandshake starts and completes a server ALTS handshaking for GCP. Once // ServerHandshake starts and completes a server ALTS handshaking for GCP. Once
// done, ServerHandshake returns a secure connection. // done, ServerHandshake returns a secure connection.
func (h *altsHandshaker) ServerHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error) { func (h *altsHandshaker) ServerHandshake(ctx context.Context) (net.Conn, credentials.AuthInfo, error) {
if !acquire(1) { if !acquire() {
return nil, nil, errDropped return nil, nil, errDropped
} }
defer release(1) defer release()
if h.side != core.ServerSide { if h.side != core.ServerSide {
return nil, nil, errors.New("only handshakers created using NewServerHandshaker can perform a server handshaker") return nil, nil, errors.New("only handshakers created using NewServerHandshaker can perform a server handshaker")