From 26611640850f6c80d811b49f57d4b941956ebe67 Mon Sep 17 00:00:00 2001
From: Lionel Jouin <lionel.jouin@est.tech>
Date: Fri, 16 Dec 2022 12:08:23 +0100
Subject: [PATCH] NSE/NS registration support of regsitry authorization

Authorization has been introduced as part of v1.7.0.
networkservicemesh/api#148
These changes are then now require to register a NS or NSE if registry
policies are enabled in nsmgr.
---
 pkg/nsm/client.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkg/nsm/client.go b/pkg/nsm/client.go
index b8011476..1a9a3d93 100644
--- a/pkg/nsm/client.go
+++ b/pkg/nsm/client.go
@@ -24,6 +24,8 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/api/pkg/api/registry"
 	registryclient "github.com/networkservicemesh/sdk/pkg/registry/chains/client"
+	registryauthorize "github.com/networkservicemesh/sdk/pkg/registry/common/authorize"
+	"github.com/networkservicemesh/sdk/pkg/registry/common/clientinfo"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
 	"github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
@@ -57,7 +59,10 @@ func (apiClient *APIClient) GetClientOptions() []grpc.DialOption {
 	return append(
 		tracing.WithTracingDial(),
 		grpc.WithBlock(),
-		grpc.WithDefaultCallOptions(grpc.WaitForReady(true)),
+		grpc.WithDefaultCallOptions(
+			grpc.WaitForReady(true),
+			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(apiClient.x509source, apiClient.Config.MaxTokenLifetime))),
+		),
 		grpc.WithTransportCredentials(
 			grpcfd.TransportCredentials(
 				credentials.NewTLS(
@@ -65,6 +70,8 @@ func (apiClient *APIClient) GetClientOptions() []grpc.DialOption {
 				),
 			),
 		),
+		grpcfd.WithChainStreamInterceptor(),
+		grpcfd.WithChainUnaryInterceptor(),
 	)
 }
 
@@ -75,8 +82,11 @@ func (apiClient *APIClient) setNetworkServiceEndpointRegistryClient() {
 		registryclient.WithClientURL(&apiClient.Config.ConnectTo),
 		registryclient.WithDialOptions(clientOptions...),
 		registryclient.WithNSEAdditionalFunctionality(
+			clientinfo.NewNetworkServiceEndpointRegistryClient(),
 			sendfd.NewNetworkServiceEndpointRegistryClient(),
-		))
+		),
+		registryclient.WithAuthorizeNSRegistryClient(registryauthorize.NewNetworkServiceRegistryClient()),
+	)
 }
 
 func (apiClient *APIClient) setNetworkServiceRegistryClient() {
@@ -84,7 +94,9 @@ func (apiClient *APIClient) setNetworkServiceRegistryClient() {
 	apiClient.NetworkServiceRegistryClient = registryclient.NewNetworkServiceRegistryClient(
 		apiClient.context,
 		registryclient.WithClientURL(&apiClient.Config.ConnectTo),
-		registryclient.WithDialOptions(clientOptions...))
+		registryclient.WithDialOptions(clientOptions...),
+		registryclient.WithAuthorizeNSRegistryClient(registryauthorize.NewNetworkServiceRegistryClient()),
+	)
 }
 
 func (apiClient *APIClient) dial() {