Add Dispatcher logic and Composite Routine

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

Author: yogeshbdeshpande

vts/trustedservices/dispatcher.go

@@ -4,37 +4,76 @@ package trustedservices
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 
 	"github.com/veraison/services/handler"
 )
 
-type clientDetails struct {
+type ClientDetails struct {
 	Type     string   `json:"type"`
 	Url      string   `json:"url"`
 	Insecure bool     `json:"in-secure"`
 	CaCerts  []string `json:"caCerts"`
 	Hints    []string `json:"hint"`
 }
 type Dispatcher struct {
-	ClientInfo map[string]clientDetails
+	ClientInfo map[string]ClientDetails
 }
 
 var lvDispatcher Dispatcher
 
-// LoadDispatchTable loads the Dispatch Table from the configuration
-func LoadDispatchTable(fp string) error {
+func NewDispatcher(fp string) (*Dispatcher, error) {
+	lvDispatcher := &Dispatcher{ClientInfo: make(map[string]ClientDetails)}
 	data, err := os.ReadFile(fp)
 	if err != nil {
-		return fmt.Errorf("error reading dispatch table from %s: %w", fp, err)
+		return nil, fmt.Errorf("error reading dispatch table from %s: %w", fp, err)
 	}
-	if err := json.Unmarshal(data, &lvDispatcher); err != nil {
-		return fmt.Errorf("error unmarshalling dispatch table: %w", err)
+	jmap := make(map[string]json.RawMessage)
+	err = json.Unmarshal(data, &jmap)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshaling table from %s: %w", fp, err)
+	}
+	for k, val := range jmap {
+		var cd ClientDetails
+		err = json.Unmarshal(val, &cd)
+		// check error
+		lvDispatcher.addClientInfo(k, &cd)
+	}
+	return lvDispatcher, nil
+}
+
+func (d *Dispatcher) addClientInfo(key string, val *ClientDetails) error {
+	if d.ClientInfo == nil {
+		return errors.New("no client info to add")
 	}
+	d.ClientInfo[key] = *val
 	return nil
 }
 
+func (d *Dispatcher) GetClientConfigFromClientName(name string) (cfg []byte, err error) {
+	if d.ClientInfo == nil {
+		// return
+	}
+
+	found := false
+	for k, val := range d.ClientInfo {
+		if k == name {
+			cfg, err = json.Marshal(val)
+			if err != nil {
+				// Check Error
+			}
+			found = true
+			break
+		}
+	}
+	if !found {
+		return nil, fmt.Errorf("unable to locate client for name: %s", name)
+	}
+	return cfg, nil
+}
+
 func GetComponentVerifierFromMediaType(mt string) (handler.IComponentVerifierClientHandler, error) {
 
 	return nil, nil

vts/trustedservices/trustedservices_grpc.go

@@ -78,10 +78,10 @@ type GRPC struct {
 	CoservSigner              coservsigner.ICoservSigner
 	CACertsPEM                [][]byte
 
-	Server *grpc.Server
-	Socket net.Listener
-
-	logger *zap.SugaredLogger
+	Server     *grpc.Server
+	Socket     net.Listener
+	Dispatcher *Dispatcher
+	logger     *zap.SugaredLogger
 
 	proto.UnimplementedVTSServer
 }
@@ -96,6 +96,7 @@ func NewGRPC(
 	policyManager *policymanager.PolicyManager,
 	earSigner earsigner.IEarSigner,
 	coservSigner coservsigner.ICoservSigner,
+	lvDispatcher *Dispatcher,
 	logger *zap.SugaredLogger,
 ) ITrustedServices {
 	return &GRPC{
@@ -183,7 +184,8 @@ func (o *GRPC) Init(
 	}
 
 	if cfg.DispatchTable != "" {
-		if err := LoadDispatchTable(cfg.DispatchTable); err != nil {
+		o.Dispatcher, err = NewDispatcher(cfg.DispatchTable)
+		if err != nil {
 			return err
 		}
 	}
@@ -437,7 +439,6 @@ func (o *GRPC) GetCompositeAttestation(
 		return o.finalize(masterAppraisal, err)
 	}
 
-	/******************/
 	p, err := compositeevidenceparser.GetCEParserFromMediaType(token.MediaType)
 	if err != nil {
 		return nil, fmt.Errorf("unable to fecth parser from received MediaType: %s, %w", token.MediaType, err)
@@ -456,6 +457,10 @@ func (o *GRPC) GetCompositeAttestation(
 			return nil, fmt.Errorf("unable to get component verifier client for component evidence at index: %d, media type: %s, %w", i, mt, err)
 		}
 
+		scheme := client.GetAttestationScheme()
+		clientCfg, err = o.Dispatcher.GetClientConfigFromClientName(scheme)
+		// Check Error
+
 		// TO DO Check if this is ear.Appraisal or ear.AttestationResults
 		ar, err := client.AppraiseComponentEvidence(ev.GetevidenceData(), mt, token.Nonce, clientCfg)