add support for keystore path

Signed-off-by: Angelo De Caro <angelo.decaro@gmail.com>

Author: adecaro

platform/fabric/core/generic/id/info_test.go

@@ -46,7 +46,7 @@ func TestInfoIdemix(t *testing.T) {
 }
 
 func TestInfoX509(t *testing.T) {
-	p, err := x5092.NewProvider("./testdata/x509", "apple", nil)
+	p, err := x5092.NewProvider("./testdata/x509", "", "apple", nil)
 	assert.NoError(t, err)
 	id, _, err := p.Identity(nil)
 	assert.NoError(t, err)

platform/fabric/core/generic/msp/service.go

@@ -255,7 +255,7 @@ func (s *service) RegisterX509MSP(id string, path string, mspID string) error {
 	s.mspsMutex.Lock()
 	defer s.mspsMutex.Unlock()
 
-	provider, err := x509.NewProvider(path, mspID, s.signerService)
+	provider, err := x509.NewProvider(path, "", mspID, s.signerService)
 	if err != nil {
 		return errors.Wrapf(err, "failed instantiating idemix msp provider from [%s]", path)
 	}

platform/fabric/core/generic/msp/x509/loader.go

@@ -44,21 +44,11 @@ func (i *IdentityLoader) Load(manager driver.Manager, c config.MSP) error {
 
 	// Try without "msp"
 	rootPath := filepath.Join(manager.Config().TranslatePath(c.Path))
-	provider, err := NewProviderWithBCCSPConfig(
-		rootPath,
-		c.MSPID,
-		manager.SignerService(),
-		bccspOpts,
-	)
+	provider, err := NewProviderWithBCCSPConfig(rootPath, "", c.MSPID, manager.SignerService(), bccspOpts)
 	if err != nil {
 		logger.Warnf("failed reading bccsp msp configuration from [%s]: [%s]", rootPath, err)
 		// Try with "msp"
-		provider, err = NewProviderWithBCCSPConfig(
-			filepath.Join(rootPath, "msp"),
-			c.MSPID,
-			manager.SignerService(),
-			bccspOpts,
-		)
+		provider, err = NewProviderWithBCCSPConfig(filepath.Join(rootPath, "msp"), "", c.MSPID, manager.SignerService(), bccspOpts)
 		if err != nil {
 			logger.Warnf("failed reading bccsp msp configuration from [%s and %s]: [%s]",
 				rootPath, filepath.Join(rootPath, "msp"), err,

platform/fabric/core/generic/msp/x509/provider.go

@@ -32,15 +32,15 @@ type Provider struct {
 
 // NewProvider returns a new X509 provider. If the configuration path contains the secret key,
 // then the provider can generate also signatures, otherwise it cannot.
-func NewProvider(mspConfigPath, mspID string, signerService SignerService) (*Provider, error) {
-	return NewProviderWithBCCSPConfig(mspConfigPath, mspID, signerService, nil)
+func NewProvider(mspConfigPath, keyStorePath, mspID string, signerService SignerService) (*Provider, error) {
+	return NewProviderWithBCCSPConfig(mspConfigPath, keyStorePath, mspID, signerService, nil)
 }
 
 // NewProviderWithBCCSPConfig returns a new X509 provider with the passed BCCSP configuration.
 // If the configuration path contains the secret key,
 // then the provider can generate also signatures, otherwise it cannot.
-func NewProviderWithBCCSPConfig(mspConfigPath, mspID string, signerService SignerService, bccspConfig *config.BCCSP) (*Provider, error) {
-	p, err := newProvider(mspConfigPath, mspID, signerService, bccspConfig)
+func NewProviderWithBCCSPConfig(mspConfigPath, keyStorePath, mspID string, signerService SignerService, bccspConfig *config.BCCSP) (*Provider, error) {
+	p, err := newProvider(mspConfigPath, keyStorePath, mspID, signerService, bccspConfig)
 	if err == nil {
 		return p, nil
 	}
@@ -57,8 +57,8 @@ func NewProviderWithBCCSPConfig(mspConfigPath, mspID string, signerService Signe
 	return &Provider{id: idRaw, enrollmentID: enrollmentID}, nil
 }
 
-func newProvider(mspConfigPath, mspID string, signerService SignerService, bccspConfig *config.BCCSP) (*Provider, error) {
-	sID, err := GetSigningIdentity(mspConfigPath, mspID, bccspConfig)
+func newProvider(mspConfigPath, keyStorePath, mspID string, signerService SignerService, bccspConfig *config.BCCSP) (*Provider, error) {
+	sID, err := GetSigningIdentity(mspConfigPath, keyStorePath, mspID, bccspConfig)
 	if err != nil {
 		return nil, err
 	}

platform/fabric/core/generic/msp/x509/setup.go

@@ -31,9 +31,10 @@ const (
 	SignCerts = "signcerts"
 )
 
-// GetSigningIdentity retrieves a signing identity from the passed arguments
-func GetSigningIdentity(mspConfigPath, mspID string, bccspConfig *config.BCCSP) (driver.SigningIdentity, error) {
-	mspInstance, err := LoadLocalMSPAt(mspConfigPath, mspID, BCCSPType, bccspConfig)
+// GetSigningIdentity retrieves a signing identity from the passed arguments.
+// If keyStorePath is empty, then it is assumed that the key is at mspConfigPath/keystore
+func GetSigningIdentity(mspConfigPath, keyStorePath, mspID string, bccspConfig *config.BCCSP) (driver.SigningIdentity, error) {
+	mspInstance, err := LoadLocalMSPAt(mspConfigPath, keyStorePath, mspID, BCCSPType, bccspConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -48,7 +49,7 @@ func GetSigningIdentity(mspConfigPath, mspID string, bccspConfig *config.BCCSP)
 
 // LoadLocalMSPAt loads an MSP whose configuration is stored at 'dir', and whose
 // id and type are the passed as arguments.
-func LoadLocalMSPAt(dir, id, mspType string, bccspConfig *config.BCCSP) (msp.MSP, error) {
+func LoadLocalMSPAt(dir, keyStorePath, id, mspType string, bccspConfig *config.BCCSP) (msp.MSP, error) {
 	if mspType != BCCSPType {
 		return nil, errors.Errorf("invalid msp type, expected 'bccsp', got %s", mspType)
 	}
@@ -57,7 +58,7 @@ func LoadLocalMSPAt(dir, id, mspType string, bccspConfig *config.BCCSP) (msp.MSP
 		return nil, errors.WithMessagef(err, "could not get msp config from dir [%s]", dir)
 	}
 
-	cp, _, err := GetBCCSPFromConf(dir, bccspConfig)
+	cp, _, err := GetBCCSPFromConf(dir, keyStorePath, bccspConfig)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to get bccsp from config [%v]", bccspConfig)
 	}
@@ -89,7 +90,7 @@ func LoadVerifyingMSPAt(dir, id, mspType string) (msp.MSP, error) {
 		return nil, errors.WithMessagef(err, "could not get msp config from dir [%s]", dir)
 	}
 
-	cp, _, err := GetBCCSPFromConf(dir, nil)
+	cp, _, err := GetBCCSPFromConf(dir, "", nil)
 	if err != nil {
 		return nil, errors.WithMessagef(err, "failed to get bccsp")
 	}
@@ -121,14 +122,17 @@ func LoadLocalMSPSignerCert(dir string) ([]byte, error) {
 
 // GetBCCSPFromConf returns a BCCSP instance and its relative key store from the passed configuration.
 // If no configuration is passed, the default one is used, namely the `SW` provider.
-func GetBCCSPFromConf(dir string, conf *config.BCCSP) (bccsp.BCCSP, bccsp.KeyStore, error) {
+func GetBCCSPFromConf(dir string, keyStorePath string, conf *config.BCCSP) (bccsp.BCCSP, bccsp.KeyStore, error) {
+	if len(keyStorePath) == 0 {
+		keyStorePath = filepath.Join(dir, "keystore")
+	}
 	if conf == nil {
-		return GetSWBCCSP(dir)
+		return GetSWBCCSP(keyStorePath)
 	}
 
 	switch conf.Default {
 	case "SW":
-		return GetSWBCCSP(dir)
+		return GetSWBCCSP(keyStorePath)
 	case "PKCS11":
 		return GetPKCS11BCCSP(conf)
 	default:
@@ -172,7 +176,7 @@ func skiMapper(p11Opts config.PKCS11) func([]byte) []byte {
 
 // GetSWBCCSP returns a new instance of the software-based BCCSP
 func GetSWBCCSP(dir string) (bccsp.BCCSP, bccsp.KeyStore, error) {
-	ks, err := sw.NewFileBasedKeyStore(nil, filepath.Join(dir, "keystore"), true)
+	ks, err := sw.NewFileBasedKeyStore(nil, dir, true)
 	if err != nil {
 		return nil, nil, err
 	}

platform/fabric/core/generic/msp/x509/x509_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestDeserializer(t *testing.T) {
-	p, err := NewProvider("./testdata/msp", "apple", nil)
+	p, err := NewProvider("./testdata/msp", "", "apple", nil)
 	assert.NoError(t, err)
 	id, auditInfo, err := p.Identity(nil)
 	assert.NoError(t, err)