Further work on Dispatcher

Signed-off-by: Yogesh Deshpande <[email protected]>

Author: yogeshbdeshpande

vts/cmd/vts-service/dispatch-table.json

@@ -1,9 +1,9 @@
 {
   "vrsn-local": {
-    "type": "veraison-client", //scheme Name
+    "type": "veraison-client", 
     "url": "https://localhost:8443",
     "insecure": true,
     "ca-certs": [ "../../../deployments/docker/src/certs/rootCA.crt" ],
-    "hints": [ "application/vnd.veraison.tsm-report+cbor; provider=arm_cca" ]  //MediaType 
+    "hints": [ "application/vnd.veraison.tsm-report+cbor; provider=arm_cca" ]  
   }
 }

vts/cmd/vts-service/main.go

@@ -69,6 +69,7 @@ func main() {
 	var endPluginManager plugin.IManager[handler.IEndorsementHandler]
 	var storePluginManager plugin.IManager[handler.IStoreHandler]
 	var coservProxyPluginManager plugin.IManager[handler.ICoservProxyHandler]
+	var lvPluginManager plugin.IManager[handler.IComponentVerifierClientHandler]
 
 	psubs, err := config.GetSubs(subs["plugin"], "*go-plugin", "*builtin")
 	if err != nil {
@@ -114,6 +115,16 @@ func main() {
 		if err != nil {
 			log.Fatalf("could not create coserv PluginManagerWithLoader: %v", err)
 		}
+
+		lvPluginManager, err = plugin.CreateGoPluginManagerWithLoader(
+			loader,
+			"lead-verifier-handler",
+			log.Named("plugin"),
+			handler.ComponentVerifierClientHandlerRPC)
+		if err != nil {
+			log.Fatalf("could not create lead verifier PluginManagerWithLoader: %v", err)
+		}
+
 	} else if config.SchemeLoader == "builtin" {
 		loader, err := builtin.CreateBuiltinLoader(
 			psubs["builtin"].AllSettings(),
@@ -145,6 +156,12 @@ func main() {
 		if err != nil {
 			log.Fatalf("could not create coserv BuiltinManagerWithLoader: %v", err)
 		}
+		lvPluginManager, err = builtin.CreateBuiltinManagerWithLoader[handler.IComponentVerifierClientHandler](
+			loader, log.Named("builtin"),
+			"lead-verifier-handler")
+		if err != nil {
+			log.Fatalf("could not create lead verifier PluginManagerWithLoader: %v", err)
+		}
 	} else {
 		log.Panicw("invalid SchemeLoader value", "SchemeLoader", config.SchemeLoader)
 	}
@@ -164,6 +181,11 @@ func main() {
 		log.Info("\t", mt)
 	}
 
+	log.Info("Lead Verifier media types:")
+	for _, mt := range lvPluginManager.GetRegisteredMediaTypes() {
+		log.Info("\t", mt)
+	}
+
 	log.Info("loading EAR signer")
 	earSigner, err := earsigner.New(subs["ear-signer"], afero.NewOsFs())
 	if err != nil {
@@ -185,13 +207,13 @@ func main() {
 
 	log.Info("initializing service")
 	// from this point onwards taStore, enStore, evPluginManager,
-	// endPluginManager, storePluginManager, coservProxyPluginManager,
+	// endPluginManager, storePluginManager, coservProxyPluginManager, lvPluginManager
 	// policyManager and earSigner are owned by vts
 	vts := trustedservices.NewGRPC(taStore, enStore,
-		evPluginManager, endPluginManager, storePluginManager, coservProxyPluginManager,
-		policyManager, earSigner, coservSigner, log.Named("vts"))
+		evPluginManager, endPluginManager, storePluginManager, coservProxyPluginManager, lvPluginManager,
+		policyManager, earSigner, coservSigner, nil, log.Named("vts"))
 
-	if err = vts.Init(subs["vts"], evPluginManager, endPluginManager, storePluginManager, coservProxyPluginManager); err != nil {
+	if err = vts.Init(subs["vts"], evPluginManager, endPluginManager, storePluginManager, coservProxyPluginManager, lvPluginManager); err != nil {
 		log.Fatalf("VTS initialisation failed: %v", err)
 	}
 

vts/trustedservices/itrustedservices.go

@@ -16,6 +16,7 @@ type ITrustedServices interface {
 		endorsementManager plugin.IManager[handler.IEndorsementHandler],
 		storeManager plugin.IManager[handler.IStoreHandler],
 		coservProxyManager plugin.IManager[handler.ICoservProxyHandler],
+		lvManager plugin.IManager[handler.IComponentVerifierClientHandler],
 	) error
 	Close() error
 	Run() error

vts/trustedservices/trustedservices_grpc.go

@@ -90,9 +90,9 @@ func NewGRPC(
 	taStore, enStore kvstore.IKVStore,
 	evidencePluginManager plugin.IManager[handler.IEvidenceHandler],
 	endorsementPluginManager plugin.IManager[handler.IEndorsementHandler],
-	leadVerifierPluginManager plugin.IManager[handler.IComponentVerifierClientHandler],
 	storePluginManager plugin.IManager[handler.IStoreHandler],
 	coservProxyPluginManager plugin.IManager[handler.ICoservProxyHandler],
+	leadVerifierPluginManager plugin.IManager[handler.IComponentVerifierClientHandler],
 	policyManager *policymanager.PolicyManager,
 	earSigner earsigner.IEarSigner,
 	coservSigner coservsigner.ICoservSigner,
@@ -104,9 +104,9 @@ func NewGRPC(
 		EnStore:                   enStore,
 		EvPluginManager:           evidencePluginManager,
 		EndPluginManager:          endorsementPluginManager,
-		LeadVerifierPluginManager: leadVerifierPluginManager,
 		StorePluginManager:        storePluginManager,
 		CoservProxyPluginManager:  coservProxyPluginManager,
+		LeadVerifierPluginManager: leadVerifierPluginManager,
 		PolicyManager:             policyManager,
 		EarSigner:                 earSigner,
 		CoservSigner:              coservSigner,
@@ -129,6 +129,7 @@ func (o *GRPC) Init(
 	endorsementManager plugin.IManager[handler.IEndorsementHandler],
 	storeManager plugin.IManager[handler.IStoreHandler],
 	coservProxyManager plugin.IManager[handler.ICoservProxyHandler],
+	leadVerifierProxyManager plugin.IManager[handler.IComponentVerifierClientHandler],
 ) error {
 	var err error
 
@@ -146,6 +147,7 @@ func (o *GRPC) Init(
 	o.EndPluginManager = endorsementManager
 	o.StorePluginManager = storeManager
 	o.CoservProxyPluginManager = coservProxyManager
+	o.LeadVerifierPluginManager = leadVerifierProxyManager
 
 	if cfg.ListenAddress != "" {
 		o.ServerAddress = cfg.ListenAddress