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

Add rollback after adding invalid changes

Browse Source
This commit is contained in:
mcrakhman 2022-08-16 00:57:38 +02:00 committed by Mikhail Iudin
parent 1ea9f03f57
commit 38209fc1fb
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/acl/tree/acltree.go
View File

@ -15,6 +15,7 @@ import (
type AddResultSummary int type AddResultSummary int
var ErrTreeWithoutIdentity = errors.New("acl tree is created without identity") var ErrTreeWithoutIdentity = errors.New("acl tree is created without identity")
var ErrHasInvalidChanges = errors.New("the change is invalid")
const ( const (
AddResultSummaryNothing AddResultSummary = iota AddResultSummaryNothing AddResultSummary = iota

14
pkg/acl/tree/doctree.go
View File

@ -228,6 +228,10 @@ func (d *docTree) AddRawChanges(ctx context.Context, aclTree ACLTree, rawChanges
if d.HasChange(ch.Id) { if d.HasChange(ch.Id) {
continue continue
} }
// if we already added the change to invalid ones
if _, exists := d.tree.invalidChanges[ch.Id]; exists {
return AddResult{}, ErrHasInvalidChanges
}
var change *Change var change *Change
change, err = NewFromVerifiedRawChange(ch, d.identityKeys, d.treeBuilder.signingPubKeyDecoder) change, err = NewFromVerifiedRawChange(ch, d.identityKeys, d.treeBuilder.signingPubKeyDecoder)
@ -329,7 +333,15 @@ func (d *docTree) AddRawChanges(ctx context.Context, aclTree ACLTree, rawChanges
// as an optimization we could've started from current heads, but I didn't implement that // as an optimization we could've started from current heads, but I didn't implement that
err = d.validator.ValidateTree(d.tree, aclTree) err = d.validator.ValidateTree(d.tree, aclTree)
if err != nil { if err != nil {
return AddResult{}, err // rolling back
for _, ch := range d.tmpChangesBuf {
if _, exists := d.tree.attached[ch.Id]; exists {
delete(d.tree.attached, ch.Id)
} else if _, exists := d.tree.unAttached[ch.Id]; exists {
delete(d.tree.unAttached, ch.Id)
}
}
return AddResult{}, ErrHasInvalidChanges
} }
addResult = AddResult{ addResult = AddResult{