anyproto/any-sync
1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-11 10:18:08 +09:00
Code Activity

Fix addcontent acl list locks

Browse source
This commit is contained in:
mcrakhman 2022-09-07 11:31:16 +02:00 • committed by Mikhail Iudin
parent d175be5728
commit dec7cc6ee3
No known key found for this signature in database
GPG key ID: FAAAA8BAABDFF1C0
1 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

43
pkg/acl/tree/objecttree.go
View file

@ -209,31 +209,17 @@ func (ot *objectTree) Storage() storage.TreeStorage {
}
func (ot *objectTree) AddContent(ctx context.Context, content SignableChangeContent) (rawChange *aclpb.RawChange, err error) {
ot.aclList.Lock()
defer func() {
ot.aclList.Unlock()
if ot.updateListener != nil {
if err == nil && ot.updateListener != nil {
ot.updateListener.Update(ot)
}
}()
state := ot.aclList.ACLState() // special method for own keys
readKey, err := state.CurrentReadKey()
payload, err := ot.prepareBuilderContent(content)
if err != nil {
return nil, err
return
}
payload := BuilderContent{
treeHeadIds: ot.tree.Heads(),
aclHeadId: ot.aclList.Head().Id,
snapshotBaseId: ot.tree.RootId(),
currentReadKeyHash: state.CurrentReadKeyHash(),
identity: content.Identity,
isSnapshot: content.IsSnapshot,
signingKey: content.Key,
readKey: readKey,
content: content.Proto,
}
objChange, rawChange, err := ot.changeBuilder.BuildContent(payload)
if content.IsSnapshot {
// clearing tree, because we already fixed everything in the last snapshot
@ -253,6 +239,29 @@ func (ot *objectTree) AddContent(ctx context.Context, content SignableChangeCont
return
}
func (ot *objectTree) prepareBuilderContent(content SignableChangeContent) (cnt BuilderContent, err error) {
ot.aclList.RLock()
defer ot.aclList.RUnlock()
state := ot.aclList.ACLState() // special method for own keys
readKey, err := state.CurrentReadKey()
if err != nil {
return
}
cnt = BuilderContent{
treeHeadIds: ot.tree.Heads(),
aclHeadId: ot.aclList.Head().Id,
snapshotBaseId: ot.tree.RootId(),
currentReadKeyHash: state.CurrentReadKeyHash(),
identity: content.Identity,
isSnapshot: content.IsSnapshot,
signingKey: content.Key,
readKey: readKey,
content: content.Proto,
}
return
}
func (ot *objectTree) AddRawChanges(ctx context.Context, rawChanges ...*aclpb.RawChange) (addResult AddResult, err error) {
var mode Mode
mode, addResult, err = ot.addRawChanges(ctx, rawChanges...)