Fixup! add default driver

sapthasurendran · sapthasurendran · commit d767bb5daa41 · 2023-01-27T14:13:30.000+05:30
Signed-off-by: sapthasurendran &lt;saptha.surendran@ibm.com&gt;
diff --git a/platform/view/core/id/provider.go b/platform/view/core/id/provider.go
@@ -7,13 +7,11 @@ SPDX-License-Identifier: Apache-2.0
 package id
 
 import (
-	"io/ioutil"
-
 	"github.com/pkg/errors"
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/id/ecdsa"
+	kms "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
@@ -44,13 +42,15 @@ type provider struct {
 	defaultID       view.Identity
 	admins          []view.Identity
 	clients         []view.Identity
+	kms             kms.Driver
 }
 
-func NewProvider(configProvider ConfigProvider, sigService SigService, endpointService EndpointService) *provider {
+func NewProvider(configProvider ConfigProvider, sigService SigService, endpointService EndpointService, driver kms.Driver) *provider {
 	return &provider{
 		configProvider:  configProvider,
 		sigService:      sigService,
 		endpointService: endpointService,
+		kms:             driver,
 	}
 }
 
@@ -96,20 +96,12 @@ func (p *provider) loadDefaultIdentity() error {
 	if err != nil {
 		return errors.Wrapf(err, "failed loading SFC Node Identity")
 	}
-	defaultID
 
-	id, verifier, err := ecdsa.NewIdentityFromPEMCert(defaultID)
+	id, signer, verifier, err := p.kms.Load(p.configProvider, defaultID)
 	if err != nil {
-		return errors.Wrap(err, "failed loading default verifier")
+		return errors.Wrapf(err, "failed loading default signer")
 	}
-	// fileCont, err := ioutil.ReadFile(p.configProvider.GetPath("fsc.identity.key.file"))
-	// if err != nil {
-	// 	return errors.Wrapf(err, "failed reading file [%s]", fileCont)
-	// }
-	// signer, err := ecdsa.NewSignerFromPEM(fileCont)
-	// if err != nil {
-	// 	return errors.Wrapf(err, "failed loading default signer")
-	// }
+
 	if err := p.sigService.RegisterSigner(id, signer, verifier); err != nil {
 		return errors.Wrapf(err, "failed registering default identity signer")
 	}
diff --git a/platform/view/core/id/provider_test.go b/platform/view/core/id/provider_test.go
@@ -13,6 +13,8 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/id"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/core/id/mock"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms"
+	_ "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms/driver/default"
 )
 
 func TestLoad(t *testing.T) {
@@ -29,7 +31,9 @@ func TestLoad(t *testing.T) {
 	cp.TranslatePathReturnsOnCall(1, "./testdata/client/client.pem")
 	sigService := &mock.SigService{}
 
-	idProvider := id.NewProvider(cp, sigService, nil)
+	kmsDriver, err := kms.GetKMSDriver("default")
+	assert.NoError(t, err, "failed getting kms driver")
+	idProvider := id.NewProvider(cp, sigService, nil, kmsDriver)
 	assert.NoError(t, idProvider.Load(), "failed loading identities")
 
 	raw, err := id.LoadIdentity("./testdata/default/signcerts/default.pem")
diff --git a/platform/view/sdk/sdk.go b/platform/view/sdk/sdk.go
@@ -29,6 +29,8 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/events/simple"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/flogging"
 	grpc2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/grpc"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms"
+	_ "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms/driver/default"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kvs"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics/operations"
 	view2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/server/view"
@@ -106,8 +108,14 @@ func (p *p) Install() error {
 	assert.NoError(err, "failed instantiating endpoint service")
 	assert.NoError(p.registry.RegisterService(endpointService), "failed registering endpoint service")
 
+	//Get Default KMS Driver
+	kmsDriver, err := kms.GetKMSDriver("default")
+	if err != nil {
+		return errors.Wrapf(err, "failed getting key management driver")
+	}
+
 	// Set Identity Provider
-	idProvider := id.NewProvider(configProvider, signerService, endpointService)
+	idProvider := id.NewProvider(configProvider, signerService, endpointService, kmsDriver)
 	assert.NoError(idProvider.Load(), "failed loading identities")
 	assert.NoError(p.registry.RegisterService(idProvider))
 
diff --git a/platform/view/services/kms/driver/bccsp/driver.go b/platform/view/services/kms/driver/bccsp/driver.go
diff --git a/platform/view/services/kms/driver/default/driver.go b/platform/view/services/kms/driver/default/driver.go
@@ -0,0 +1,40 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package driver
+
+import (
+	"io/ioutil"
+
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/id/ecdsa"
+	kms "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
+
+	"github.com/pkg/errors"
+)
+
+type Driver struct{}
+
+func (d *Driver) Load(configProvider kms.ConfigProvider, pemBytes []byte) (view.Identity, driver.Signer, driver.Verifier, error) {
+	fileCont, err := ioutil.ReadFile(configProvider.GetPath("fsc.identity.key.file"))
+	if err != nil {
+		return nil, nil, nil, errors.Wrapf(err, "failed reading file [%s]", fileCont)
+	}
+	id, verifier, err := ecdsa.NewIdentityFromPEMCert(pemBytes)
+	if err != nil {
+		return nil, nil, nil, errors.Wrap(err, "failed loading default verifier")
+	}
+	signer, err := ecdsa.NewSignerFromPEM(fileCont)
+	if err != nil {
+		return id, nil, verifier, errors.Wrapf(err, "failed loading default signer")
+	}
+	return id, signer, verifier, nil
+}
+
+func init() {
+	kms.Register("default", &Driver{})
+}
diff --git a/platform/view/services/kms/driver/driver.go b/platform/view/services/kms/driver/driver.go
diff --git a/platform/view/services/kms/kms.go b/platform/view/services/kms/kms.go
@@ -10,19 +10,32 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/kms/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/driver"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 	"github.com/pkg/errors"
 )
 
 var (
 	driversMu sync.RWMutex
-	drivers   = make(map[string]driver.Driver)
+	drivers   = make(map[string]Driver)
 )
 
-// Register makes a db driver available by the provided name.
+// Driver models the key management interface
+type Driver interface {
+	// Load returns the signer, verifier and signing identity bound to the byte representation of passed pem encoded public key.
+	Load(configProvider ConfigProvider, pemBytes []byte) (view.Identity, driver.Signer, driver.Verifier, error)
+}
+
+type ConfigProvider interface {
+	GetPath(s string) string
+	GetStringSlice(key string) []string
+	TranslatePath(path string) string
+}
+
+// Register makes a kms driver available by the provided name.
 // If Register is called twice with the same name or if driver is nil,
 // it panics.
-func Register(name string, driver driver.Driver) {
+func Register(name string, driver Driver) {
 	driversMu.Lock()
 	defer driversMu.Unlock()
 	if driver == nil {
@@ -46,38 +59,17 @@ func Drivers() []string {
 	return list
 }
 
-func GetKeyManagementService(name string) (*driver.Driver, error) {
-	// TODO: support multiple external committers
+// GetKMSDriver returns the registered drivers.
+func GetKMSDriver(driverName string) (Driver, error) {
 	dNames := Drivers()
 	if len(dNames) == 0 {
-		return nil, errors.New("no kms driver found" )
+		return nil, errors.New("no kms driver found")
 	}
-	return drivers[dNames[0]], nil
-
-}
-
-// // Config models the DB configuration
-// type Config interface {
-// 	// UnmarshalKey takes a single key and unmarshals it into a Struct
-// 	UnmarshalKey(key string, rawVal interface{}) error
-// }
-
-// // Open returns a new persistence handle. Similarly to database/sql:
-// // driverName is a string that describes the driver
-// // dataSourceName describes the data source in a driver-specific format.
-// // The returned connection is only used by one goroutine at a time.
-// func Open(sp view.ServiceProvider, driverName, dataSourceName string, config Config) (driver.Persistence, error) {
-// 	driversMu.RLock()
-// 	driver, ok := drivers[driverName]
-// 	driversMu.RUnlock()
-// 	if !ok {
-// 		return nil, errors.Errorf("driver [%s] not found", driverName)
-// 	}
-// 	d, err := driver.New(sp, dataSourceName, config)
-// 	if err != nil {
-// 		return nil, errors.Wrapf(err, "failed opening datasource [%s][%s[", driverName, dataSourceName)
-// 	}
-// 	return d, nil
-// }
+	driver, ok := drivers[driverName]
+	if !ok {
+		return nil, errors.New("no kms driver found with name" + driverName)
 
+	}
+	return driver, nil
 
+}
