Merge pull request #51 from anyproto/GO-2836-coordinator-acl

GO-2836 use BuildAclListWithIdentity instead BuildAclList

Author: cheggaaa

acl/acl.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	commonaccount "github.com/anyproto/any-sync/accountservice"
 	"github.com/anyproto/any-sync/app"
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/app/ocache"
@@ -29,12 +30,14 @@ type Acl interface {
 }
 
 type aclService struct {
-	consService consensusclient.Service
-	cache       ocache.OCache
+	consService    consensusclient.Service
+	cache          ocache.OCache
+	accountService commonaccount.Service
 }
 
 func (as *aclService) Init(a *app.App) (err error) {
 	as.consService = app.MustComponent[consensusclient.Service](a)
+	as.accountService = app.MustComponent[commonaccount.Service](a)
 
 	var metricReg *prometheus.Registry
 	if m := a.Component(metric.CName); m != nil {
@@ -53,7 +56,7 @@ func (as *aclService) Name() (name string) {
 }
 
 func (as *aclService) loadObject(ctx context.Context, id string) (ocache.Object, error) {
-	return newAclObject(ctx, as.consService, id)
+	return as.newAclObject(ctx, id)
 }
 
 func (as *aclService) get(ctx context.Context, spaceId string) (list.AclList, error) {

acl/acl_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/anyproto/any-sync/consensus/consensusclient"
 	"github.com/anyproto/any-sync/consensus/consensusclient/mock_consensusclient"
 	"github.com/anyproto/any-sync/consensus/consensusproto"
+	"github.com/anyproto/any-sync/testutil/accounttest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
@@ -115,7 +116,7 @@ func newFixture(t *testing.T) *fixture {
 	fx.consCl.EXPECT().Run(gomock.Any()).AnyTimes()
 	fx.consCl.EXPECT().Close(gomock.Any()).AnyTimes()
 
-	fx.a.Register(fx.consCl).Register(fx.Acl)
+	fx.a.Register(fx.consCl).Register(fx.Acl).Register(&accounttest.AccountTestService{})
 
 	require.NoError(t, fx.a.Start(ctx))
 	return fx

acl/object.go

@@ -7,42 +7,41 @@ import (
 
 	"github.com/anyproto/any-sync/commonspace/object/acl/list"
 	"github.com/anyproto/any-sync/commonspace/object/acl/liststorage"
-	"github.com/anyproto/any-sync/consensus/consensusclient"
 	"github.com/anyproto/any-sync/consensus/consensusproto"
 	"go.uber.org/atomic"
 	"go.uber.org/zap"
 )
 
-func newAclObject(ctx context.Context, cs consensusclient.Service, id string) (*aclObject, error) {
+func (as *aclService) newAclObject(ctx context.Context, id string) (*aclObject, error) {
 	obj := &aclObject{
-		id:          id,
-		consService: cs,
-		ready:       make(chan struct{}),
+		id:         id,
+		aclService: as,
+		ready:      make(chan struct{}),
 	}
-	if err := cs.Watch(id, obj); err != nil {
+	if err := as.consService.Watch(id, obj); err != nil {
 		return nil, err
 	}
 	select {
 	case <-obj.ready:
 		if obj.consErr != nil {
-			_ = cs.UnWatch(id)
+			_ = as.consService.UnWatch(id)
 			return nil, obj.consErr
 		}
 		return obj, nil
 	case <-ctx.Done():
-		_ = cs.UnWatch(id)
+		_ = as.consService.UnWatch(id)
 		return nil, ctx.Err()
 	}
 }
 
 type aclObject struct {
-	id    string
-	store liststorage.ListStorage
-	list.AclList
+	id         string
+	aclService *aclService
+	store      liststorage.ListStorage
 
-	ready       chan struct{}
-	consErr     error
-	consService consensusclient.Service
+	list.AclList
+	ready   chan struct{}
+	consErr error
 
 	lastUsage atomic.Time
 
@@ -57,7 +56,7 @@ func (a *aclObject) AddConsensusRecords(recs []*consensusproto.RawRecordWithId)
 		if a.store, a.consErr = liststorage.NewInMemoryAclListStorage(a.id, recs); a.consErr != nil {
 			return
 		}
-		if a.AclList, a.consErr = list.BuildAclList(a.store, list.NoOpAcceptorVerifier{}); a.consErr != nil {
+		if a.AclList, a.consErr = list.BuildAclListWithIdentity(a.aclService.accountService.Account(), a.store, list.NoOpAcceptorVerifier{}); a.consErr != nil {
 			return
 		}
 	} else {
@@ -82,7 +81,7 @@ func (a *aclObject) AddConsensusError(err error) {
 }
 
 func (a *aclObject) Close() (err error) {
-	return a.consService.UnWatch(a.id)
+	return a.aclService.consService.UnWatch(a.id)
 }
 
 func (a *aclObject) TryClose(objectTTL time.Duration) (res bool, err error) {