acid-ant/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

[#584] Fix order in tableToAst

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2022-07-17 06:26:20 +04:00 committed by Alex Vanin
parent 74300a75a9
commit 260fb95677
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
api/handler/acl.go
View file

@ -566,13 +566,14 @@ func addPredefinedACP(acp *AccessControlPolicy, cannedACL string) (*AccessContro
} }
func tableToAst(table *eacl.Table, bktName string) *ast { func tableToAst(table *eacl.Table, bktName string) *ast {
res := &ast{} result := &ast{}
rr := make(map[string]*astResource) metResources := make(map[string]int)
for _, record := range table.Records() { for i := len(table.Records()) - 1; i >= 0; i-- {
resName := bktName resName := bktName
var objectName string var objectName string
var version string var version string
record := table.Records()[i]
for _, filter := range record.Filters() { for _, filter := range record.Filters() {
if filter.Matcher() == eacl.MatchStringEqual { if filter.Matcher() == eacl.MatchStringEqual {
if filter.Key() == object.AttributeFileName { if filter.Key() == object.AttributeFileName {
@ -584,25 +585,30 @@ func tableToAst(table *eacl.Table, bktName string) *ast {
} }
} }
} }
r, ok := rr[resName] idx, ok := metResources[resName]
if !ok { if !ok {
r = &astResource{resourceInfo: resourceInfo{ resource := &astResource{resourceInfo: resourceInfo{
Bucket: bktName, Bucket: bktName,
Object: objectName, Object: objectName,
Version: version, Version: version,
}} }}
result.Resources = append(result.Resources, resource)
idx = len(result.Resources) - 1
metResources[resName] = idx
} }
for _, target := range record.Targets() { for _, target := range record.Targets() {
r.Operations = addToList(r.Operations, record, target) result.Resources[idx].Operations = addToList(result.Resources[idx].Operations, record, target)
} }
rr[resName] = r
} }
for _, val := range rr { for _, res := range result.Resources {
res.Resources = append(res.Resources, val) for i, j := 0, len(res.Operations)-1; i < j; i, j = i+1, j-1 {
res.Operations[i], res.Operations[j] = res.Operations[j], res.Operations[i]
}
} }
return res return result
} }
func mergeAst(parent, child *ast) (*ast, bool) { func mergeAst(parent, child *ast) (*ast, bool) {