load fabric CA generated identity properly

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

token/core/identity/msp/idemix/lm.go

@@ -7,10 +7,13 @@ SPDX-License-Identifier: Apache-2.0
 package idemix
 
 import (
+	"encoding/json"
 	"os"
 	"path/filepath"
 	"sync"
 
+	"github.com/IBM/idemix/idemixmsp"
+
 	"github.com/hyperledger/fabric-protos-go/msp"
 
 	"github.com/IBM/idemix"
@@ -33,6 +36,10 @@ import (
 
 var logger = flogging.MustGetLogger("token-sdk.msp.idemix")
 
+const (
+	SignerConfigFull = "SignerConfigFull"
+)
+
 type PublicParametersWithIdemixSupport interface {
 	IdemixCurve() math3.CurveID
 }
@@ -233,7 +240,7 @@ func (lm *LocalMembership) registerProvider(identity config.Identity, curveID ma
 	if err != nil {
 		logger.Debugf("failed reading idemix msp configuration from [%s]: [%s], try adding 'msp'...", identity.Path, err)
 		// Try with "msp"
-		conf, err = idemix2.GetLocalMspConfigWithType(filepath.Join(identity.Path, "msp"), nil, lm.mspID)
+		conf, err = GetLocalMspConfigWithType(filepath.Join(identity.Path, "msp"), lm.mspID, lm.ignoreVerifyOnlyWallet)
 		if err != nil {
 			return errors.Wrapf(err, "failed reading idemix msp configuration from [%s] and with 'msp'", identity.Path)
 		}
@@ -378,19 +385,32 @@ func (lm *LocalMembership) loadFromKVS() error {
 	return nil
 }
 
+func GetLocalMspConfigWithType(dir string, id string, ignoreVerifyOnlyWallet bool) (*msp.MSPConfig, error) {
+	mspConfig, err := GetIdemixMspConfigWithType(dir, id, ignoreVerifyOnlyWallet)
+	if err != nil {
+		// load it using the fabric-ca format
+		mspConfig2, err2 := GetFabricCAIdemixMspConfig(dir, id)
+		if err2 != nil {
+			return nil, errors.Wrapf(err2, "cannot get idemix msp config from [%s]: [%s]", dir, err)
+		}
+		mspConfig = mspConfig2
+	}
+	return mspConfig, nil
+}
+
 // GetIdemixMspConfigWithType returns the configuration for the Idemix MSP of the specified type
 func GetIdemixMspConfigWithType(dir string, ID string, ignoreVerifyOnlyWallet bool) (*msp.MSPConfig, error) {
-	ipkBytes, err := os.ReadFile(filepath.Join(dir, idemix.IdemixConfigDirMsp, idemix.IdemixConfigFileIssuerPublicKey))
+	ipkBytes, err := ReadFile(filepath.Join(dir, idemix.IdemixConfigDirMsp, idemix.IdemixConfigFileIssuerPublicKey))
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to read issuer public key file")
 	}
 
-	revocationPkBytes, err := os.ReadFile(filepath.Join(dir, idemix.IdemixConfigDirMsp, idemix.IdemixConfigFileRevocationPublicKey))
+	revocationPkBytes, err := ReadFile(filepath.Join(dir, idemix.IdemixConfigDirMsp, idemix.IdemixConfigFileRevocationPublicKey))
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to read revocation public key file")
 	}
 
-	idemixConfig := &msp.IdemixMSPConfig{
+	idemixConfig := &idemixmsp.IdemixMSPConfig{
 		Name:         ID,
 		Ipk:          ipkBytes,
 		RevocationPk: revocationPkBytes,
@@ -400,7 +420,7 @@ func GetIdemixMspConfigWithType(dir string, ID string, ignoreVerifyOnlyWallet bo
 	if ignoreVerifyOnlyWallet {
 		logger.Debugf("check the existence of SignerConfigFull")
 		// check if `SignerConfigFull` exists, if yes, use that file
-		path := filepath.Join(dir, idemix.IdemixConfigDirUser, "SignerConfigFull")
+		path := filepath.Join(dir, idemix.IdemixConfigDirUser, SignerConfigFull)
 		_, err := os.Stat(path)
 		if err == nil {
 			logger.Debugf("SignerConfigFull found, use it")
@@ -409,7 +429,7 @@ func GetIdemixMspConfigWithType(dir string, ID string, ignoreVerifyOnlyWallet bo
 	}
 	signerBytes, err := os.ReadFile(signerConfigPath)
 	if err == nil {
-		signerConfig := &msp.IdemixMSPSignerConfig{}
+		signerConfig := &idemixmsp.IdemixMSPSignerConfig{}
 		err = proto.Unmarshal(signerBytes, signerConfig)
 		if err != nil {
 			return nil, err
@@ -424,3 +444,65 @@ func GetIdemixMspConfigWithType(dir string, ID string, ignoreVerifyOnlyWallet bo
 
 	return &msp.MSPConfig{Config: confBytes, Type: int32(idemix.IDEMIX)}, nil
 }
+
+// GetFabricCAIdemixMspConfig returns the configuration for the Idemix MSP generated by Fabric-CA
+func GetFabricCAIdemixMspConfig(dir string, ID string) (*msp.MSPConfig, error) {
+	path := filepath.Join(dir, idemix2.ConfigFileIssuerPublicKey)
+	ipkBytes, err := ReadFile(path)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read issuer public key file at [%s]", path)
+	}
+
+	path = filepath.Join(dir, idemix2.IdemixConfigFileRevocationPublicKey)
+	revocationPkBytes, err := ReadFile(path)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read revocation public key file at [%s]", path)
+	}
+
+	idemixConfig := &idemixmsp.IdemixMSPConfig{
+		Name:         ID,
+		Ipk:          ipkBytes,
+		RevocationPk: revocationPkBytes,
+	}
+
+	path = filepath.Join(dir, idemix2.ConfigDirUser, idemix2.ConfigFileSigner)
+	signerBytes, err := ReadFile(path)
+	if err == nil {
+		// signerBytes is a json structure, convert it to protobuf
+		si := &idemix2.SignerConfig{}
+		if err := json.Unmarshal(signerBytes, si); err != nil {
+			return nil, errors.Wrapf(err, "failed to json unmarshal signer config read at [%s]", path)
+		}
+
+		signerConfig := &idemixmsp.IdemixMSPSignerConfig{
+			Cred:                            si.Cred,
+			Sk:                              si.Sk,
+			OrganizationalUnitIdentifier:    si.OrganizationalUnitIdentifier,
+			Role:                            int32(si.Role),
+			EnrollmentId:                    si.EnrollmentID,
+			CredentialRevocationInformation: si.CredentialRevocationInformation,
+			RevocationHandle:                si.RevocationHandle,
+		}
+		idemixConfig.Signer = signerConfig
+	} else {
+		if !os.IsNotExist(errors.Cause(err)) {
+			return nil, errors.Wrapf(err, "failed to read the content of signer config at [%s]", path)
+		}
+	}
+
+	confBytes, err := proto.Marshal(idemixConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return &msp.MSPConfig{Config: confBytes, Type: int32(idemix.IDEMIX)}, nil
+}
+
+func ReadFile(file string) ([]byte, error) {
+	fileCont, err := os.ReadFile(file)
+	if err != nil {
+		return nil, errors.Wrapf(err, "could not read file %s", file)
+	}
+
+	return fileCont, nil
+}