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

Fix pkg tests

Browse Source
This commit is contained in:
mcrakhman 2022-09-13 09:04:47 +02:00 committed by Mikhail Iudin
parent c6acf63977
commit fa123f4ab0
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/acl/common/keychain.go
View File

@ -21,7 +21,7 @@ func (k *Keychain) GetOrAdd(identity string) (signingkey.PubKey, error) {
if key, exists := k.keys[identity]; exists { if key, exists := k.keys[identity]; exists {
return key, nil return key, nil
} }
res, err := k.decoder.DecodeFromString(identity) res, err := k.decoder.DecodeFromBytes([]byte(identity))
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
pkg/acl/tree/changebuilder.go
View File

@ -60,13 +60,15 @@ func (c *changeBuilder) ConvertFromRaw(rawIdChange *aclpb.RawTreeChangeWithId, v
} }
if verify { if verify {
identityKey, err := c.keys.GetOrAdd(ch.Identity) var identityKey signingkey.PubKey
identityKey, err = c.keys.GetOrAdd(ch.Identity)
if err != nil { if err != nil {
return return
} }
// verifying signature // verifying signature
res, err := identityKey.Verify(raw.Payload, raw.Signature) var res bool
res, err = identityKey.Verify(raw.Payload, raw.Signature)
if err != nil { if err != nil {
return return
} }

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

@ -43,7 +43,7 @@ func (v *objectTreeValidator) validateChange(tree *Tree, aclList list.ACLList, c
state = aclList.ACLState() state = aclList.ACLState()
) )
// checking if the user could write // checking if the user could write
perm, err = state.PermissionsAtRecord(c.Content.AclHeadId, c.Content.Identity) perm, err = state.PermissionsAtRecord(c.Content.AclHeadId, c.Identity)
if err != nil { if err != nil {
return return
} }

32
pkg/acl/tree/objecttree_test.go
View File

@ -14,7 +14,7 @@ import (
type mockChangeCreator struct{} type mockChangeCreator struct{}
func (c *mockChangeCreator) createRaw(id, aclId, snapshotId string, isSnapshot bool, prevIds ...string) *aclpb.RawChange { func (c *mockChangeCreator) createRaw(id, aclId, snapshotId string, isSnapshot bool, prevIds ...string) *aclpb.RawTreeChangeWithId {
aclChange := &aclpb.TreeChange{ aclChange := &aclpb.TreeChange{
TreeHeadIds: prevIds, TreeHeadIds: prevIds,
AclHeadId: aclId, AclHeadId: aclId,
@ -51,19 +51,15 @@ type mockChangeBuilder struct {
originalBuilder ChangeBuilder originalBuilder ChangeBuilder
} }
func (c *mockChangeBuilder) ConvertFromRaw(rawChange *aclpb.RawChange) (ch *Change, err error) { func (c *mockChangeBuilder) ConvertFromRaw(rawChange *aclpb.RawTreeChangeWithId, verify bool) (ch *Change, err error) {
return c.originalBuilder.ConvertFromRaw(rawChange) return c.originalBuilder.ConvertFromRaw(rawChange, false)
} }
func (c *mockChangeBuilder) ConvertFromRawAndVerify(rawChange *aclpb.RawChange) (ch *Change, err error) { func (c *mockChangeBuilder) BuildContent(payload BuilderContent) (ch *Change, raw *aclpb.RawTreeChangeWithId, err error) {
return c.originalBuilder.ConvertFromRaw(rawChange)
}
func (c *mockChangeBuilder) BuildContent(payload BuilderContent) (ch *Change, raw *aclpb.RawChange, err error) {
panic("implement me") panic("implement me")
} }
func (c *mockChangeBuilder) BuildRaw(ch *Change) (raw *aclpb.RawChange, err error) { func (c *mockChangeBuilder) BuildRaw(ch *Change) (raw *aclpb.RawTreeChangeWithId, err error) {
return c.originalBuilder.BuildRaw(ch) return c.originalBuilder.BuildRaw(ch)
} }
@ -141,7 +137,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"), changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"),
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
} }
@ -182,7 +178,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("0", aclList.Head().Id, "", true, ""), changeCreator.createRaw("0", aclList.Head().Id, "", true, ""),
} }
res, err := objTree.AddRawChanges(context.Background(), rawChanges...) res, err := objTree.AddRawChanges(context.Background(), rawChanges...)
@ -202,7 +198,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
} }
res, err := objTree.AddRawChanges(context.Background(), rawChanges...) res, err := objTree.AddRawChanges(context.Background(), rawChanges...)
@ -224,7 +220,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"), changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"),
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"), changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"),
@ -268,7 +264,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"), changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"),
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"), changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"),
@ -287,7 +283,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"), changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"),
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"), changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"),
@ -361,7 +357,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"), changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"),
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"), changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"),
@ -437,7 +433,7 @@ func TestObjectTree(t *testing.T) {
changeCreator := ctx.changeCreator changeCreator := ctx.changeCreator
objTree := ctx.objTree objTree := ctx.objTree
rawChanges := []*aclpb.RawChange{ rawChanges := []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"), changeCreator.createRaw("1", aclList.Head().Id, "0", false, "0"),
changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("2", aclList.Head().Id, "0", false, "1"),
changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"), changeCreator.createRaw("3", aclList.Head().Id, "0", true, "2"),
@ -446,7 +442,7 @@ func TestObjectTree(t *testing.T) {
require.NoError(t, err, "adding changes should be without error") require.NoError(t, err, "adding changes should be without error")
require.Equal(t, "3", objTree.Root().Id) require.Equal(t, "3", objTree.Root().Id)
rawChanges = []*aclpb.RawChange{ rawChanges = []*aclpb.RawTreeChangeWithId{
changeCreator.createRaw("4", aclList.Head().Id, "0", false, "2"), changeCreator.createRaw("4", aclList.Head().Id, "0", false, "2"),
changeCreator.createRaw("5", aclList.Head().Id, "0", false, "1"), changeCreator.createRaw("5", aclList.Head().Id, "0", false, "1"),
changeCreator.createRaw("6", aclList.Head().Id, "0", false, "3", "4", "5"), changeCreator.createRaw("6", aclList.Head().Id, "0", false, "3", "4", "5"),