lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 07:59:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

check signature only when auth is enabled

Browse Source
This commit is contained in:
Chris Lu
2020-08-08 09:11:40 -07:00
parent fcb0ff9890
commit 828a5ae429
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
weed/s3api/s3api_object_handlers.go
View File

@@ -40,20 +40,22 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request)
return return
} }
rAuthType := getRequestAuthType(r)
dataReader := r.Body dataReader := r.Body
var s3ErrCode ErrorCode if s3a.iam.isEnabled() {
switch rAuthType { rAuthType := getRequestAuthType(r)
case authTypeStreamingSigned: var s3ErrCode ErrorCode
dataReader, s3ErrCode = s3a.iam.newSignV4ChunkedReader(r) switch rAuthType {
case authTypeSignedV2, authTypePresignedV2: case authTypeStreamingSigned:
_, s3ErrCode = s3a.iam.isReqAuthenticatedV2(r) dataReader, s3ErrCode = s3a.iam.newSignV4ChunkedReader(r)
case authTypePresigned, authTypeSigned: case authTypeSignedV2, authTypePresignedV2:
_, s3ErrCode = s3a.iam.reqSignatureV4Verify(r) _, s3ErrCode = s3a.iam.isReqAuthenticatedV2(r)
} case authTypePresigned, authTypeSigned:
if s3ErrCode != ErrNone { _, s3ErrCode = s3a.iam.reqSignatureV4Verify(r)
writeErrorResponse(w, s3ErrCode, r.URL) }
return if s3ErrCode != ErrNone {
writeErrorResponse(w, s3ErrCode, r.URL)
return
}
} }
defer dataReader.Close() defer dataReader.Close()

28
weed/s3api/s3api_object_multipart_handlers.go
View File

@@ -179,20 +179,22 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ
return return
} }
rAuthType := getRequestAuthType(r)
dataReader := r.Body dataReader := r.Body
var s3ErrCode ErrorCode if s3a.iam.isEnabled() {
switch rAuthType { rAuthType := getRequestAuthType(r)
case authTypeStreamingSigned: var s3ErrCode ErrorCode
dataReader, s3ErrCode = s3a.iam.newSignV4ChunkedReader(r) switch rAuthType {
case authTypeSignedV2, authTypePresignedV2: case authTypeStreamingSigned:
_, s3ErrCode = s3a.iam.isReqAuthenticatedV2(r) dataReader, s3ErrCode = s3a.iam.newSignV4ChunkedReader(r)
case authTypePresigned, authTypeSigned: case authTypeSignedV2, authTypePresignedV2:
_, s3ErrCode = s3a.iam.reqSignatureV4Verify(r) _, s3ErrCode = s3a.iam.isReqAuthenticatedV2(r)
} case authTypePresigned, authTypeSigned:
if s3ErrCode != ErrNone { _, s3ErrCode = s3a.iam.reqSignatureV4Verify(r)
writeErrorResponse(w, s3ErrCode, r.URL) }
return if s3ErrCode != ErrNone {
writeErrorResponse(w, s3ErrCode, r.URL)
return
}
} }
defer dataReader.Close() defer dataReader.Close()