MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-22 19:35:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Protect racy access of internal auth states. (#3238)

Browse Source 
Fixes #3232
This commit is contained in:
Harshavardhana 2016-11-11 00:14:32 -08:00 committed by GitHub
parent a8ab02a73a
commit e8d9d710d0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/auth-rpc-client.go
View File

@ -19,6 +19,7 @@ package cmd
import ( import (
"fmt" "fmt"
"net/rpc" "net/rpc"
"sync"
"time" "time"
jwtgo "github.com/dgrijalva/jwt-go" jwtgo "github.com/dgrijalva/jwt-go"
@ -96,6 +97,7 @@ type authConfig struct {
// AuthRPCClient is a wrapper type for RPCClient which provides JWT based authentication across reconnects. // AuthRPCClient is a wrapper type for RPCClient which provides JWT based authentication across reconnects.
type AuthRPCClient struct { type AuthRPCClient struct {
mu sync.Mutex
config *authConfig config *authConfig
rpc *RPCClient // reconnect'able rpc client built on top of net/rpc Client rpc *RPCClient // reconnect'able rpc client built on top of net/rpc Client
isLoggedIn bool // Indicates if the auth client has been logged in and token is valid. isLoggedIn bool // Indicates if the auth client has been logged in and token is valid.
@ -117,13 +119,17 @@ func newAuthClient(cfg *authConfig) *AuthRPCClient {
// Close - closes underlying rpc connection. // Close - closes underlying rpc connection.
func (authClient *AuthRPCClient) Close() error { func (authClient *AuthRPCClient) Close() error {
authClient.mu.Lock()
// reset token on closing a connection // reset token on closing a connection
authClient.isLoggedIn = false authClient.isLoggedIn = false
authClient.mu.Unlock()
return authClient.rpc.Close() return authClient.rpc.Close()
} }
// Login - a jwt based authentication is performed with rpc server. // Login - a jwt based authentication is performed with rpc server.
func (authClient *AuthRPCClient) Login() error { func (authClient *AuthRPCClient) Login() error {
authClient.mu.Lock()
defer authClient.mu.Unlock()
// Return if already logged in. // Return if already logged in.
if authClient.isLoggedIn { if authClient.isLoggedIn {
return nil return nil
@ -168,7 +174,9 @@ func (authClient *AuthRPCClient) Call(serviceMethod string, args interface {
// Invalidate token, and mark it for re-login on subsequent reconnect. // Invalidate token, and mark it for re-login on subsequent reconnect.
if err != nil && err == rpc.ErrShutdown { if err != nil && err == rpc.ErrShutdown {
authClient.mu.Lock()
authClient.isLoggedIn = false authClient.isLoggedIn = false
authClient.mu.Unlock()
} }
} }
return err return err