fix filter mechanisms

Signed-off-by: Denis Tingajkin <[email protected]>

pkg/networkservice/chains/nsmgr/server.go

@@ -22,6 +22,7 @@ package nsmgr
 import (
 	"context"
 
+	"github.com/networkservicemesh/sdk/pkg/networkservice/common/filtermechanisms"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/interpose"
 
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
@@ -72,6 +73,7 @@ type nsmgrServer struct {
 func NewServer(ctx context.Context, nsmRegistration *registryapi.NetworkServiceEndpoint, authzServer networkservice.NetworkServiceServer, tokenGenerator token.GeneratorFunc, registryCC grpc.ClientConnInterface, clientDialOptions ...grpc.DialOption) Nsmgr {
 	rv := &nsmgrServer{}
 
+	var urlsRegistryServer registryapi.NetworkServiceEndpointRegistryServer
 	var localbypassRegistryServer registryapi.NetworkServiceEndpointRegistryServer
 
 	nsRegistry := newRemoteNSServer(registryCC)
@@ -100,6 +102,7 @@ func NewServer(ctx context.Context, nsmRegistration *registryapi.NetworkServiceE
 		localbypass.NewServer(&localbypassRegistryServer),
 		excludedprefixes.NewServer(ctx),
 		interpose.NewServer(nsmRegistration.Name, &interposeRegistry),
+		filtermechanisms.NewServer(&urlsRegistryServer),
 		connect.NewServer(
 			ctx,
 			client.NewClientFactory(nsmRegistration.Name,
@@ -111,6 +114,7 @@ func NewServer(ctx context.Context, nsmRegistration *registryapi.NetworkServiceE
 
 	nsChain := chain_registry.NewNetworkServiceRegistryServer(nsRegistry)
 	nseChain := chain_registry.NewNetworkServiceEndpointRegistryServer(
+		urlsRegistryServer,
 		interposeRegistry,         // Store cross connect NSEs
 		localbypassRegistryServer, // Store endpoint Id to EndpointURL for local access.
 		seturl.NewNetworkServiceEndpointRegistryServer(nsmRegistration.Url), // Remember endpoint URL

pkg/networkservice/common/filtermechanisms/server.go

@@ -20,46 +20,46 @@ import (
 	"context"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"google.golang.org/grpc/peer"
-
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"
+	"github.com/networkservicemesh/api/pkg/api/registry"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
+	"github.com/networkservicemesh/sdk/pkg/registry/common/endpointurls"
+	"github.com/networkservicemesh/sdk/pkg/tools/clienturl"
 )
 
-type filterMechanismsServer struct{}
+type filterMechanismsServer struct {
+	urls endpointurls.Set
+}
 
 // NewServer - filters out remote mechanisms if connection is received from a unix file socket, otherwise filters
 // out local mechanisms
-func NewServer() networkservice.NetworkServiceServer {
-	return &filterMechanismsServer{}
+func NewServer(registryServer *registry.NetworkServiceEndpointRegistryServer) networkservice.NetworkServiceServer {
+	result := &filterMechanismsServer{}
+	*registryServer = endpointurls.NewNetworkServiceEndpointRegistryServer(&result.urls)
+	return result
 }
 
 func (f *filterMechanismsServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	p, ok := peer.FromContext(ctx)
-	if ok {
-		if p.Addr.Network() == "unix" {
-			var mechanisms []*networkservice.Mechanism
-			for _, mechanism := range request.GetMechanismPreferences() {
-				if mechanism.Cls == cls.LOCAL {
-					mechanisms = append(mechanisms, mechanism)
-				}
-			}
-			request.MechanismPreferences = mechanisms
-			return next.Server(ctx).Request(ctx, request)
-		}
-		var mechanisms []*networkservice.Mechanism
-		for _, mechanism := range request.GetMechanismPreferences() {
-			if mechanism.Cls == cls.REMOTE {
-				mechanisms = append(mechanisms, mechanism)
-			}
-		}
-		request.MechanismPreferences = mechanisms
+	u := clienturl.ClientURL(ctx)
+	if _, ok := f.urls.Load(*u); ok {
+		request.MechanismPreferences = filterMechanismsByCls(request.GetMechanismPreferences(), cls.LOCAL)
+	} else {
+		request.MechanismPreferences = filterMechanismsByCls(request.GetMechanismPreferences(), cls.REMOTE)
 	}
 	return next.Server(ctx).Request(ctx, request)
 }
 
 func (f *filterMechanismsServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
 	return next.Server(ctx).Close(ctx, conn)
 }
+func filterMechanismsByCls(mechanisms []*networkservice.Mechanism, mechanismCls string) []*networkservice.Mechanism {
+	var result []*networkservice.Mechanism
+	for _, mechanism := range mechanisms {
+		if mechanism.Cls == mechanismCls {
+			mechanisms = append(mechanisms, mechanism)
+		}
+	}
+	return result
+}