MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-05 18:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Access Key requests (#11979)

Browse Source 
Fix accessing claims when auth error is unchecked.

Only replaced when unchecked and when clearly without side effects.

Fixes #11959
This commit is contained in:
Klaus Post 2021-04-06 17:35:46 +02:00 committed by Harshavardhana
parent e3da59c923
commit f687ba53bc
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/jwt/parser.go
View File

@ -81,6 +81,15 @@ type MapClaims struct {
jwtgo.MapClaims jwtgo.MapClaims
} }
// GetAccessKey will return the access key.
// If nil an empty string will be returned.
func (c *MapClaims) GetAccessKey() string {
if c == nil {
return ""
}
return c.AccessKey
}
// NewStandardClaims - initializes standard claims // NewStandardClaims - initializes standard claims
func NewStandardClaims() *StandardClaims { func NewStandardClaims() *StandardClaims {
return &StandardClaims{} return &StandardClaims{}

10
cmd/web-handlers.go
View File

@ -226,7 +226,7 @@ func (web *webAPIHandlers) MakeBucket(r *http.Request, args *MakeBucketArgs, rep
reply.UIVersion = Version reply.UIVersion = Version
reqParams := extractReqParams(r) reqParams := extractReqParams(r)
reqParams["accessKey"] = claims.AccessKey reqParams["accessKey"] = claims.GetAccessKey()
sendEvent(eventArgs{ sendEvent(eventArgs{
EventName: event.BucketCreated, EventName: event.BucketCreated,
@ -723,7 +723,7 @@ func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs,
) )
reqParams := extractReqParams(r) reqParams := extractReqParams(r)
reqParams["accessKey"] = claims.AccessKey reqParams["accessKey"] = claims.GetAccessKey()
sourceIP := handlers.GetSourceIP(r) sourceIP := handlers.GetSourceIP(r)
next: next:
@ -1340,7 +1340,7 @@ func (web *webAPIHandlers) Upload(w http.ResponseWriter, r *http.Request) {
} }
reqParams := extractReqParams(r) reqParams := extractReqParams(r)
reqParams["accessKey"] = claims.AccessKey reqParams["accessKey"] = claims.GetAccessKey()
// Notify object created event. // Notify object created event.
sendEvent(eventArgs{ sendEvent(eventArgs{
@ -1529,7 +1529,7 @@ func (web *webAPIHandlers) Download(w http.ResponseWriter, r *http.Request) {
} }
reqParams := extractReqParams(r) reqParams := extractReqParams(r)
reqParams["accessKey"] = claims.AccessKey reqParams["accessKey"] = claims.GetAccessKey()
// Notify object accessed via a GET request. // Notify object accessed via a GET request.
sendEvent(eventArgs{ sendEvent(eventArgs{
@ -1684,7 +1684,7 @@ func (web *webAPIHandlers) DownloadZip(w http.ResponseWriter, r *http.Request) {
defer archive.Close() defer archive.Close()
reqParams := extractReqParams(r) reqParams := extractReqParams(r)
reqParams["accessKey"] = claims.AccessKey reqParams["accessKey"] = claims.GetAccessKey()
respElements := extractRespElements(w) respElements := extractRespElements(w)
for i, object := range args.Objects { for i, object := range args.Objects {