MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-27 12:53:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove any duplicate statements in policy input (#9385)

Browse Source 
Add support for removing duplicate statements automatically
This commit is contained in:
Harshavardhana
2020-04-17 21:26:42 -07:00
committed by GitHub
parent c4464e36c8
commit 75107d7698
4 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/iam/policy/policy.go
View File

@@ -104,8 +104,24 @@ func (iamp Policy) isValid() error {
}
}
return nil
}
// MarshalJSON - encodes Policy to JSON data.
func (iamp Policy) MarshalJSON() ([]byte, error) {
if err := iamp.isValid(); err != nil {
return nil, err
}
// subtype to avoid recursive call to MarshalJSON()
type subPolicy Policy
return json.Marshal(subPolicy(iamp))
}
func (iamp *Policy) dropDuplicateStatements() {
redo:
for i := range iamp.Statements {
for _, statement := range iamp.Statements[i+1:] {
for j, statement := range iamp.Statements[i+1:] {
if iamp.Statements[i].Effect != statement.Effect {
continue
}
@@ -121,24 +137,10 @@ func (iamp Policy) isValid() error {
if iamp.Statements[i].Conditions.String() != statement.Conditions.String() {
continue
}
return Errorf("duplicate actions %v, resources %v found in statements %v, %v",
statement.Actions, statement.Resources, iamp.Statements[i], statement)
iamp.Statements = append(iamp.Statements[:j], iamp.Statements[j+1:]...)
goto redo
}
}
return nil
}
// MarshalJSON - encodes Policy to JSON data.
func (iamp Policy) MarshalJSON() ([]byte, error) {
if err := iamp.isValid(); err != nil {
return nil, err
}
// subtype to avoid recursive call to MarshalJSON()
type subPolicy Policy
return json.Marshal(subPolicy(iamp))
}
// UnmarshalJSON - decodes JSON data to Iamp.
@@ -155,6 +157,8 @@ func (iamp *Policy) UnmarshalJSON(data []byte) error {
return err
}
p.dropDuplicateStatements()
*iamp = p
return nil