benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix change validator

Browse Source
This commit is contained in:
mcrakhman 2022-08-23 00:21:46 +02:00 committed by Mikhail Iudin
parent 07b17491cb
commit cf63d29b42
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/acl/list/aclstate.go
View File

@ -15,7 +15,7 @@ import (
"hash/fnv" "hash/fnv"
) )
var log = logger.NewNamed("acllist") var log = logger.NewNamed("acllist").Sugar()
var ErrNoSuchUser = errors.New("no such user") var ErrNoSuchUser = errors.New("no such user")
var ErrFailedToDecrypt = errors.New("failed to decrypt key") var ErrFailedToDecrypt = errors.New("failed to decrypt key")
@ -77,6 +77,7 @@ func (st *ACLState) UserReadKeys() map[uint64]*symmetric.Key {
func (st *ACLState) PermissionsAtRecord(id string, identity string) (UserPermissionPair, error) { func (st *ACLState) PermissionsAtRecord(id string, identity string) (UserPermissionPair, error) {
permissions, ok := st.permissionsAtRecord[id] permissions, ok := st.permissionsAtRecord[id]
if !ok { if !ok {
log.Errorf("missing record at id %s", id)
return UserPermissionPair{}, ErrNoSuchRecord return UserPermissionPair{}, ErrNoSuchRecord
} }
@ -135,6 +136,7 @@ func (st *ACLState) applyChangeAndUpdate(recordWrapper *Record) (err error) {
permissions = append(permissions, permission) permissions = append(permissions, permission)
} }
st.permissionsAtRecord[recordWrapper.Id] = permissions st.permissionsAtRecord[recordWrapper.Id] = permissions
log.Infof("adding permissions at record %s", recordWrapper.Id)
return nil return nil
} }

3
pkg/acl/list/list.go
View File

@ -7,6 +7,7 @@ import (
"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/aclpb" "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/aclpb"
"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/storage"
"github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys"
"go.uber.org/zap"
"sync" "sync"
) )
@ -98,6 +99,8 @@ func buildWithACLStateBuilder(builder *aclStateBuilder, storage storage.ListStor
indexes[records[len(records)/2].Id] = len(records) / 2 indexes[records[len(records)/2].Id] = len(records) / 2
} }
log.With(zap.String("head id", records[len(records)-1].Id), zap.String("list id", id)).
Info("building acl tree")
state, err := builder.Build(records) state, err := builder.Build(records)
if err != nil { if err != nil {
return nil, err return nil, err

2
pkg/acl/tree/changevalidator.go
View File

@ -26,7 +26,7 @@ func (v *docTreeValidator) ValidateTree(tree *Tree, aclList list.ACLList) (err e
tree.Iterate(tree.RootId(), func(c *Change) (isContinue bool) { tree.Iterate(tree.RootId(), func(c *Change) (isContinue bool) {
// checking if the user could write // checking if the user could write
perm, err = state.PermissionsAtRecord(c.Id, c.Content.Identity) perm, err = state.PermissionsAtRecord(c.Content.AclHeadId, c.Content.Identity)
if err != nil { if err != nil {
return false return false
} }