wip: support new targets in inmemory implementation

Signed-off-by: Alex Vanin <a.vanin@yadro.com>

pkg/engine/inmemory/morph_storage.go

@@ -21,7 +21,7 @@ func NewInmemoryMorphRuleChainStorage() engine.MorphRuleChainStorage {
 
 func (s *inmemoryMorphRuleChainStorage) AddMorphRuleChain(name chain.Name, target engine.Target, c *chain.Chain) (_ util.Uint256, _ uint32, err error) {
 	switch target.Type {
-	case engine.Namespace, engine.Container:
+	case engine.Namespace, engine.Container, engine.User, engine.Group:
 		_, err = s.storage.AddOverride(name, target, c)
 	default:
 		err = engine.ErrUnknownTarget
@@ -31,7 +31,7 @@ func (s *inmemoryMorphRuleChainStorage) AddMorphRuleChain(name chain.Name, targe
 
 func (s *inmemoryMorphRuleChainStorage) RemoveMorphRuleChain(name chain.Name, target engine.Target, chainID chain.ID) (_ util.Uint256, _ uint32, err error) {
 	switch target.Type {
-	case engine.Namespace, engine.Container:
+	case engine.Namespace, engine.Container, engine.User, engine.Group:
 		err = s.storage.RemoveOverride(name, target, chainID)
 	default:
 		err = engine.ErrUnknownTarget
@@ -41,7 +41,7 @@ func (s *inmemoryMorphRuleChainStorage) RemoveMorphRuleChain(name chain.Name, ta
 
 func (s *inmemoryMorphRuleChainStorage) RemoveMorphRuleChainsByTarget(name chain.Name, target engine.Target) (_ util.Uint256, _ uint32, err error) {
 	switch target.Type {
-	case engine.Namespace, engine.Container:
+	case engine.Namespace, engine.Container, engine.User, engine.Group:
 		err = s.storage.RemoveOverridesByTarget(name, target)
 	default:
 		err = engine.ErrUnknownTarget
@@ -51,7 +51,7 @@ func (s *inmemoryMorphRuleChainStorage) RemoveMorphRuleChainsByTarget(name chain
 
 func (s *inmemoryMorphRuleChainStorage) ListMorphRuleChains(name chain.Name, target engine.Target) ([]*chain.Chain, error) {
 	switch target.Type {
-	case engine.Namespace, engine.Container:
+	case engine.Namespace, engine.Container, engine.User, engine.Group:
 		return s.storage.ListOverrides(name, target)
 	default:
 	}
@@ -99,6 +99,40 @@ func (s *inmemoryMorphRuleChainStorage) ListTargetsIterator(targetType engine.Ta
 			it.Values = append(it.Values, stackitem.NewByteArray([]byte(t.Name)))
 		}
 
+		targets, err = s.storage.ListOverrideDefinedTargets(chain.S3)
+		if err != nil {
+			return
+		}
+		for _, t := range targets {
+			it.Values = append(it.Values, stackitem.NewByteArray([]byte(t.Name)))
+		}
+	case engine.User:
+		var targets []engine.Target
+		targets, err = s.storage.ListOverrideDefinedTargets(chain.Ingress)
+		if err != nil {
+			return
+		}
+		for _, t := range targets {
+			it.Values = append(it.Values, stackitem.NewByteArray([]byte(t.Name)))
+		}
+
+		targets, err = s.storage.ListOverrideDefinedTargets(chain.S3)
+		if err != nil {
+			return
+		}
+		for _, t := range targets {
+			it.Values = append(it.Values, stackitem.NewByteArray([]byte(t.Name)))
+		}
+	case engine.Group:
+		var targets []engine.Target
+		targets, err = s.storage.ListOverrideDefinedTargets(chain.Ingress)
+		if err != nil {
+			return
+		}
+		for _, t := range targets {
+			it.Values = append(it.Values, stackitem.NewByteArray([]byte(t.Name)))
+		}
+
 		targets, err = s.storage.ListOverrideDefinedTargets(chain.S3)
 		if err != nil {
 			return

pkg/engine/interface.go

@@ -37,6 +37,8 @@ type TargetType rune
 const (
 	Namespace TargetType = 'n'
 	Container TargetType = 'c'
+	User      TargetType = 'u'
+	Group     TargetType = 'g'
 )
 
 type Target struct {
@@ -48,6 +50,8 @@ type Target struct {
 type RequestTarget struct {
 	Namespace *Target
 	Container *Target
+	User      *Target
+	Groups    []Target
 }
 
 func NewRequestTargetWithNamespace(namespace string) RequestTarget {
@@ -73,6 +77,24 @@ func NewRequestTarget(namespace, container string) RequestTarget {
 	}
 }
 
+func NewRequestTargetExtended(namespace, container, user string, groups []string) RequestTarget {
+	nt := NamespaceTarget(namespace)
+	ct := ContainerTarget(container)
+	u := UserTarget(user)
+	rt := RequestTarget{
+		Namespace: &nt,
+		Container: &ct,
+		User:      &u,
+	}
+	if len(groups) != 0 {
+		rt.Groups = make([]Target, len(groups))
+		for i := range groups {
+			rt.Groups[i] = GroupTarget(groups[i])
+		}
+	}
+	return rt
+}
+
 func (rt *RequestTarget) Targets() (targets []Target) {
 	if rt.Namespace != nil {
 		targets = append(targets, *rt.Namespace)
@@ -80,6 +102,12 @@ func (rt *RequestTarget) Targets() (targets []Target) {
 	if rt.Container != nil {
 		targets = append(targets, *rt.Container)
 	}
+	if rt.User != nil {
+		targets = append(targets, *rt.User)
+	}
+	if len(rt.Groups) != 0 {
+		targets = append(targets, rt.Groups...)
+	}
 	return
 }
 
@@ -97,6 +125,20 @@ func ContainerTarget(container string) Target {
 	}
 }
 
+func UserTarget(user string) Target {
+	return Target{
+		Type: User,
+		Name: user,
+	}
+}
+
+func GroupTarget(group string) Target {
+	return Target{
+		Type: Group,
+		Name: group,
+	}
+}
+
 // MorphRuleChainStorageReader is the interface that provides read-only methods to receive
 // data like chains, target or admin from a chain storage.
 type MorphRuleChainStorageReader interface {

pkg/morph/policy/policy_contract_storage.go

@@ -209,6 +209,10 @@ func policyKind(typ engine.TargetType) (policy.Kind, error) {
 		return policy.Namespace, nil
 	} else if typ == engine.Container {
 		return policy.Container, nil
+	} else if typ == engine.User {
+		return 'u', nil
+	} else if typ == engine.Group {
+		return 'g', nil
 	}
 	return policy.Kind(0), ErrEngineTargetTypeUnsupported
 }