[#1117] core: Introduce SubjectProvider interface for FrostfsID

* Make tree, object and container services use SubjectProvider interface.
* Fix unit-tests.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>

pkg/ape/request/request.go

@@ -1,4 +1,4 @@
-package ape
+package request
 
 import (
 	aperesource "git.frostfs.info/TrueCloudLab/policy-engine/pkg/resource"

pkg/core/frostfsid/subject_provider.go

@@ -0,0 +1,16 @@
+package frostfsid
+
+import (
+	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
+	"github.com/nspcc-dev/neo-go/pkg/util"
+)
+
+const (
+	SubjectNotFoundErrorMessage = "subject not found"
+)
+
+// SubjectProvider interface provides methods to get subject from FrostfsID contract.
+type SubjectProvider interface {
+	GetSubject(util.Uint160) (*client.Subject, error)
+	GetSubjectExtended(util.Uint160) (*client.SubjectExtended, error)
+}

pkg/morph/client/frostfsid/client.go

@@ -3,6 +3,7 @@ package frostfsid
 import (
 	"fmt"
 
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
 	"github.com/nspcc-dev/neo-go/pkg/encoding/fixedn"
 	"github.com/nspcc-dev/neo-go/pkg/util"
@@ -20,6 +21,8 @@ type Client struct {
 	client *client.StaticClient // static FrostFS ID contract client
 }
 
+var _ frostfsidcore.SubjectProvider = (*Client)(nil)
+
 // NewFromMorph wraps client to work with FrostFS ID contract.
 func NewFromMorph(cli *client.Client, contract util.Uint160, fee fixedn.Fixed8) (*Client, error) {
 	sc, err := client.NewStatic(cli, contract, fee, client.TryNotary(), client.AsAlphabet())

pkg/services/container/ape.go

@@ -14,9 +14,9 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
 	session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
 	aperequest "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/ape/request"
 	containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
@@ -30,11 +30,6 @@ import (
 	commonschema "git.frostfs.info/TrueCloudLab/policy-engine/schema/common"
 	nativeschema "git.frostfs.info/TrueCloudLab/policy-engine/schema/native"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	"github.com/nspcc-dev/neo-go/pkg/util"
-)
-
-const (
-	subjectNotFoundErrorMessage = "subject not found"
 )
 
 var (
@@ -59,22 +54,18 @@ type containers interface {
 	Get(cid.ID) (*containercore.Container, error)
 }
 
-type frostfsidSubjectProvider interface {
-	GetSubject(util.Uint160) (*client.Subject, error)
-}
-
 type apeChecker struct {
 	router policyengine.ChainRouter
 	reader containers
 	ir     ir
 	nm     netmap.Source
 
-	frostFSIDClient frostfsidSubjectProvider
+	frostFSIDClient frostfsidcore.SubjectProvider
 
 	next Server
 }
 
-func NewAPEServer(router policyengine.ChainRouter, reader containers, ir ir, nm netmap.Source, frostFSIDClient frostfsidSubjectProvider, srv Server) Server {
+func NewAPEServer(router policyengine.ChainRouter, reader containers, ir ir, nm netmap.Source, frostFSIDClient frostfsidcore.SubjectProvider, srv Server) Server {
 	return &apeChecker{
 		router:          router,
 		reader:          reader,
@@ -574,7 +565,7 @@ func (ac *apeChecker) namespaceByOwner(owner *refs.OwnerID) (string, error) {
 	if err == nil {
 		namespace = subject.Namespace
 	} else {
-		if !strings.Contains(err.Error(), subjectNotFoundErrorMessage) {
+		if !strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage) {
 			return "", fmt.Errorf("get subject error: %w", err)
 		}
 	}
@@ -630,7 +621,7 @@ func (ac *apeChecker) fillWithUserClaimTags(reqProps map[string]string, pk *keys
 	}
 	subj, err := ac.frostFSIDClient.GetSubject(pk.GetScriptHash())
 	if err != nil {
-		if !strings.Contains(err.Error(), subjectNotFoundErrorMessage) {
+		if !strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage) {
 			return nil, fmt.Errorf("get subject error: %w", err)
 		}
 		return reqProps, nil

pkg/services/container/ape_test.go

@@ -15,6 +15,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
 	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
 	containercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	cnrSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
@@ -922,13 +923,22 @@ func (s *netmapStub) Epoch() (uint64, error) {
 }
 
 type frostfsidStub struct {
-	subjects map[util.Uint160]*client.Subject
+	subjects    map[util.Uint160]*client.Subject
+	subjectsExt map[util.Uint160]*client.SubjectExtended
 }
 
 func (f *frostfsidStub) GetSubject(owner util.Uint160) (*client.Subject, error) {
 	s, ok := f.subjects[owner]
 	if !ok {
-		return nil, fmt.Errorf("%s", subjectNotFoundErrorMessage)
+		return nil, fmt.Errorf("%s", frostfsidcore.SubjectNotFoundErrorMessage)
+	}
+	return s, nil
+}
+
+func (f *frostfsidStub) GetSubjectExtended(owner util.Uint160) (*client.SubjectExtended, error) {
+	s, ok := f.subjectsExt[owner]
+	if !ok {
+		return nil, fmt.Errorf("%s", frostfsidcore.SubjectNotFoundErrorMessage)
 	}
 	return s, nil
 }
@@ -965,7 +975,8 @@ func newTestAPEServer() testAPEServer {
 	netmap := &netmapStub{}
 
 	frostfsIDSubjectReader := &frostfsidStub{
-		subjects: map[util.Uint160]*client.Subject{},
+		subjects:    map[util.Uint160]*client.Subject{},
+		subjectsExt: map[util.Uint160]*client.SubjectExtended{},
 	}
 
 	apeChecker := &apeChecker{

pkg/services/object/ape/checker.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
@@ -14,7 +14,6 @@ import (
 	policyengine "git.frostfs.info/TrueCloudLab/policy-engine/pkg/engine"
 	nativeschema "git.frostfs.info/TrueCloudLab/policy-engine/schema/native"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	"github.com/nspcc-dev/neo-go/pkg/util"
 )
 
 type checkerImpl struct {
@@ -22,14 +21,10 @@ type checkerImpl struct {
 
 	headerProvider HeaderProvider
 
-	frostFSIDClient frostfsidSubjectProvider
+	frostFSIDClient frostfsidcore.SubjectProvider
 }
 
-type frostfsidSubjectProvider interface {
+func NewChecker(chainRouter policyengine.ChainRouter, headerProvider HeaderProvider, frostFSIDClient frostfsidcore.SubjectProvider) Checker {
-	GetSubject(util.Uint160) (*client.Subject, error)
-}
-
-func NewChecker(chainRouter policyengine.ChainRouter, headerProvider HeaderProvider, frostFSIDClient frostfsidSubjectProvider) Checker {
 	return &checkerImpl{
 		chainRouter: chainRouter,
 

pkg/services/object/ape/checker_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -156,14 +157,15 @@ var (
 )
 
 type frostfsIDProviderMock struct {
-	m map[util.Uint160]*client.Subject
+	subjects         map[util.Uint160]*client.Subject
+	subjectsExtended map[util.Uint160]*client.SubjectExtended
 }
 
-var _ frostfsidSubjectProvider = (*frostfsIDProviderMock)(nil)
+var _ frostfsidcore.SubjectProvider = (*frostfsIDProviderMock)(nil)
 
 func newFrostfsIDProviderMock(t *testing.T) *frostfsIDProviderMock {
 	return &frostfsIDProviderMock{
-		m: map[util.Uint160]*client.Subject{
+		subjects: map[util.Uint160]*client.Subject{
 			scriptHashFromSenderKey(t, senderKey): {
 				Namespace: "testnamespace",
 				Name:      "test",
@@ -173,6 +175,27 @@ func newFrostfsIDProviderMock(t *testing.T) *frostfsIDProviderMock {
 				},
 			},
 		},
+		subjectsExtended: map[util.Uint160]*client.SubjectExtended{
+			scriptHashFromSenderKey(t, senderKey): {
+				Namespace: "testnamespace",
+				Name:      "test",
+				KV: map[string]string{
+					"tag-attr1": "value1",
+					"tag-attr2": "value2",
+				},
+				Groups: []*client.Group{
+					{
+						ID:        1,
+						Name:      "test",
+						Namespace: "testnamespace",
+						KV: map[string]string{
+							"attr1": "value1",
+							"attr2": "value2",
+						},
+					},
+				},
+			},
+		},
 	}
 }
 
@@ -183,9 +206,17 @@ func scriptHashFromSenderKey(t *testing.T, senderKey string) util.Uint160 {
 }
 
 func (f *frostfsIDProviderMock) GetSubject(key util.Uint160) (*client.Subject, error) {
-	v, ok := f.m[key]
+	v, ok := f.subjects[key]
 	if !ok {
-		return nil, fmt.Errorf("%s", subjectNotFoundErrorMessage)
+		return nil, fmt.Errorf("%s", frostfsidcore.SubjectNotFoundErrorMessage)
+	}
+	return v, nil
+}
+
+func (f *frostfsIDProviderMock) GetSubjectExtended(key util.Uint160) (*client.SubjectExtended, error) {
+	v, ok := f.subjectsExtended[key]
+	if !ok {
+		return nil, fmt.Errorf("%s", frostfsidcore.SubjectNotFoundErrorMessage)
 	}
 	return v, nil
 }

pkg/services/object/ape/request.go

@@ -8,6 +8,7 @@ import (
 
 	objectV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
 	aperequest "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/ape/request"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -18,10 +19,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 )
 
-const (
-	subjectNotFoundErrorMessage = "subject not found"
-)
-
 var defaultRequest = aperequest.Request{}
 
 func nativeSchemaRole(role acl.Role) string {
@@ -153,7 +150,7 @@ func (c *checkerImpl) fillWithUserClaimTags(reqProps map[string]string, prm Prm)
 	}
 	subj, err := c.frostFSIDClient.GetSubject(pk.GetScriptHash())
 	if err != nil {
-		if !strings.Contains(err.Error(), subjectNotFoundErrorMessage) {
+		if !strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage) {
 			return nil, fmt.Errorf("get subject error: %w", err)
 		}
 		return reqProps, nil

pkg/services/tree/ape.go

@@ -8,6 +8,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/ape/converter"
 	aperequest "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/ape/request"
 	core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
 	cnrSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
@@ -19,8 +20,6 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 )
 
-var subjectNotFoundErrorMessage = "subject not found"
-
 func (s *Service) checkAPE(container *core.Container, cid cid.ID, operation acl.Op, role acl.Role, publicKey *keys.PublicKey) error {
 	namespace := ""
 	cntNamespace, hasNamespace := strings.CutSuffix(cnrSDK.ReadDomain(container.Value).Zone(), ".ns")
@@ -83,7 +82,7 @@ func (s *Service) fillWithUserClaimTags(reqProps map[string]string, publicKey *k
 	}
 	subj, err := s.frostfsidSubjectProvider.GetSubject(publicKey.GetScriptHash())
 	if err != nil {
-		if !strings.Contains(err.Error(), subjectNotFoundErrorMessage) {
+		if !strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage) {
 			return nil, fmt.Errorf("get subject error: %w", err)
 		}
 		return reqProps, nil

pkg/services/tree/options.go

@@ -4,21 +4,16 @@ import (
 	"crypto/ecdsa"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
+	frostfsidcore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/frostfsid"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	policyengine "git.frostfs.info/TrueCloudLab/policy-engine/pkg/engine"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
-	"github.com/nspcc-dev/neo-go/pkg/util"
 )
 
-type FrostfsidSubjectProvider interface {
-	GetSubject(util.Uint160) (*client.Subject, error)
-}
-
 type ContainerSource interface {
 	container.Source
 
@@ -36,7 +31,7 @@ type cfg struct {
 	rawPub                   []byte
 	nmSource                 netmap.Source
 	cnrSource                ContainerSource
-	frostfsidSubjectProvider FrostfsidSubjectProvider
+	frostfsidSubjectProvider frostfsidcore.SubjectProvider
 	eaclSource               container.EACLSource
 	forest                   pilorama.Forest
 	// replication-related parameters
@@ -62,7 +57,7 @@ func WithContainerSource(src ContainerSource) Option {
 	}
 }
 
-func WithFrostfsidSubjectProvider(provider FrostfsidSubjectProvider) Option {
+func WithFrostfsidSubjectProvider(provider frostfsidcore.SubjectProvider) Option {
 	return func(c *cfg) {
 		c.frostfsidSubjectProvider = provider
 	}