MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-17 17:30:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

config: Avoid stale credentials in memory. (#4466)

Browse Source
This commit is contained in:
Harshavardhana 2017-08-08 12:14:32 -07:00 committed by GitHub
parent 6f7ace3d3e
commit f346ca44f0
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/admin-handlers.go
View File

@ -181,8 +181,14 @@ func (adminAPI adminAPIHandlers) ServiceCredentialsHandler(w http.ResponseWriter
} }
// Update local credentials in memory. // Update local credentials in memory.
serverConfig.SetCredential(creds) prevCred := serverConfig.SetCredential(creds)
// Save credentials to config file
if err = serverConfig.Save(); err != nil { if err = serverConfig.Save(); err != nil {
// Save the current creds when failed to update.
serverConfig.SetCredential(prevCred)
errorIf(err, "Unable to update the config with new credentials.")
writeErrorResponse(w, ErrInternalError, r.URL) writeErrorResponse(w, ErrInternalError, r.URL)
return return
} }

7
cmd/browser-peer-rpc.go
View File

@ -69,11 +69,14 @@ func (br *browserPeerAPIHandlers) SetAuthPeer(args SetAuthPeerArgs, reply *AuthR
} }
// Update credentials in memory // Update credentials in memory
serverConfig.SetCredential(args.Creds) prevCred := serverConfig.SetCredential(args.Creds)
// Save credentials to config file // Save credentials to config file
if err := serverConfig.Save(); err != nil { if err := serverConfig.Save(); err != nil {
errorIf(err, "Error updating config file with new credentials sent from browser RPC.") // Save the current creds when failed to update.
serverConfig.SetCredential(prevCred)
errorIf(err, "Unable to update the config with new credentials sent from browser RPC.")
return err return err
} }

13
cmd/config-v19.go
View File

@ -61,11 +61,12 @@ func (s *serverConfigV19) GetVersion() string {
return s.Version return s.Version
} }
// SetRegion set new region. // SetRegion set a new region.
func (s *serverConfigV19) SetRegion(region string) { func (s *serverConfigV19) SetRegion(region string) {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
// Save new region.
s.Region = region s.Region = region
} }
@ -77,13 +78,19 @@ func (s *serverConfigV19) GetRegion() string {
return s.Region return s.Region
} }
// SetCredentials set new credentials. // SetCredentials set new credentials. SetCredential returns the previous credential.
func (s *serverConfigV19) SetCredential(creds credential) { func (s *serverConfigV19) SetCredential(creds credential) (prevCred credential) {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
// Save previous credential.
prevCred = s.Credential
// Set updated credential. // Set updated credential.
s.Credential = creds s.Credential = creds
// Return previous credential.
return prevCred
} }
// GetCredentials get current credentials. // GetCredentials get current credentials.

5
cmd/web-handlers.go
View File

@ -405,10 +405,13 @@ func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *Se
errsMap := updateCredsOnPeers(creds) errsMap := updateCredsOnPeers(creds)
// Update local credentials // Update local credentials
serverConfig.SetCredential(creds) prevCred := serverConfig.SetCredential(creds)
// Persist updated credentials. // Persist updated credentials.
if err = serverConfig.Save(); err != nil { if err = serverConfig.Save(); err != nil {
// Save the current creds when failed to update.
serverConfig.SetCredential(prevCred)
errsMap[globalMinioAddr] = err errsMap[globalMinioAddr] = err
} }