MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Regression fix to bring back checkPolicyCond function call (#7897)

Browse Source 
Fixes #7895
This commit is contained in:
ebozduman 2019-07-09 22:18:43 -07:00 committed by Nitish Tiwari
parent 1dc25bcf5f
commit 36ee110563
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bucket-handlers.go
View File

@ -537,7 +537,7 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h
return return
} }
// Remove all tmp files creating during multipart upload // Remove all tmp files created during multipart upload
defer form.RemoveAll() defer form.RemoveAll()
// Extract all form fields // Extract all form fields

3
cmd/postpolicyform.go
View File

@ -109,7 +109,7 @@ type PostPolicyForm struct {
} }
} }
// parsePostPolicyForm - Parse JSON policy string into typed POostPolicyForm structure. // parsePostPolicyForm - Parse JSON policy string into typed PostPolicyForm structure.
func parsePostPolicyForm(policy string) (ppf PostPolicyForm, e error) { func parsePostPolicyForm(policy string) (ppf PostPolicyForm, e error) {
// Convert po into interfaces and // Convert po into interfaces and
// perform strict type conversion using reflection. // perform strict type conversion using reflection.
@ -256,6 +256,7 @@ func checkPostPolicy(formValues http.Header, postPolicyForm PostPolicyForm) erro
return fmt.Errorf("Invalid according to Policy: Policy Condition failed") return fmt.Errorf("Invalid according to Policy: Policy Condition failed")
} }
// Check if current policy condition is satisfied // Check if current policy condition is satisfied
condPassed = checkPolicyCond(op, formValues.Get(formCanonicalName), v.Value)
if !condPassed { if !condPassed {
return fmt.Errorf("Invalid according to Policy: Policy Condition failed") return fmt.Errorf("Invalid according to Policy: Policy Condition failed")
} }