Revert "Idemix MSP Folder Structure incompatible with what Fabric exp…

…ects #303" This reverts commit acea746. Signed-off-by: Josh Kneubuhl <[email protected]>
hyperledger · Jul 8, 2022 · 1f16304 · 1f16304
1 parent 98dfc86
commit 1f16304
Show file tree

Hide file tree

Showing 22 changed files with 50 additions and 1,690 deletions.
diff --git a/api/serverresponses.go b/api/serverresponses.go
@@ -20,7 +20,7 @@ type CAInfoResponseNet struct {
 	// Base64 encoding of Idemix issuer public key
 	IssuerPublicKey string
 	// Base64 encoding of PEM-encoded Idemix issuer revocation public key
-	RevocationPublicKey string
+	IssuerRevocationPublicKey string
 	// Version of the server
 	Version string
 }

diff --git a/cmd/fabric-ca-client/command/enroll.go b/cmd/fabric-ca-client/command/enroll.go
@@ -88,5 +88,5 @@ func (c *enrollCmd) runEnroll(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	return storeRevocationPublicKey(cfg, &resp.CAInfo)
+	return storeIssuerRevocationPublicKey(cfg, &resp.CAInfo)
 }
diff --git a/cmd/fabric-ca-client/command/getcainfo.go b/cmd/fabric-ca-client/command/getcainfo.go
@@ -102,7 +102,7 @@ func (c *getCAInfoCmd) runGetCACert(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	return storeRevocationPublicKey(client.Config, si)
+	return storeIssuerRevocationPublicKey(client.Config, si)
 }
 
 // Store the CAChain in the CACerts folder of MSP (Membership Service Provider)
@@ -200,9 +200,9 @@ func storeIssuerPublicKey(config *lib.ClientConfig, si *lib.GetCAInfoResponse) e
 	return nil
 }
 
-func storeRevocationPublicKey(config *lib.ClientConfig, si *lib.GetCAInfoResponse) error {
-	if len(si.RevocationPublicKey) > 0 {
-		err := storeToFile("Issuer revocation public key", config.MSPDir, "RevocationPublicKey", si.RevocationPublicKey)
+func storeIssuerRevocationPublicKey(config *lib.ClientConfig, si *lib.GetCAInfoResponse) error {
+	if len(si.IssuerRevocationPublicKey) > 0 {
+		err := storeToFile("Issuer revocation public key", config.MSPDir, "IssuerRevocationPublicKey", si.IssuerRevocationPublicKey)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/fabric-ca-client/command/main_test.go b/cmd/fabric-ca-client/command/main_test.go
@@ -2189,7 +2189,7 @@ func TestCleanUp(t *testing.T) {
 	os.Remove(filepath.Join(tdDir, "ca-key.pem"))
 	os.Remove(filepath.Join(tdDir, "IssuerPublicKey"))
 	os.Remove(filepath.Join(tdDir, "IssuerSecretKey"))
-	os.Remove(filepath.Join(tdDir, "RevocationPublicKey"))
+	os.Remove(filepath.Join(tdDir, "IssuerRevocationPublicKey"))
 	os.Remove(testYaml)
 	os.Remove(fabricCADB)
 	os.RemoveAll(moptionDir)
@@ -2200,7 +2200,7 @@ func cleanMultiCADir() {
 	caFolder := filepath.Join(tdDir, "ca/rootca")
 	nestedFolders := []string{"ca1", "ca2"}
 	removeFiles := []string{"msp", "ca-cert.pem",
-		"fabric-ca-server.db", "fabric-ca2-server.db", "ca-chain.pem", "IssuerPublicKey", "IssuerSecretKey", "RevocationPublicKey"}
+		"fabric-ca-server.db", "fabric-ca2-server.db", "ca-chain.pem", "IssuerPublicKey", "IssuerSecretKey", "IssuerRevocationPublicKey"}
 
 	for _, nestedFolder := range nestedFolders {
 		path := filepath.Join(caFolder, nestedFolder)

diff --git a/cmd/fabric-ca-server/main_test.go b/cmd/fabric-ca-server/main_test.go
@@ -435,7 +435,7 @@ func TestClean(t *testing.T) {
 	os.Remove("ca-cert.pem")
 	os.Remove("IssuerSecretKey")
 	os.Remove("IssuerPublicKey")
-	os.Remove("RevocationPublicKey")
+	os.Remove("IssuerRevocationPublicKey")
 	os.Remove("fabric-ca-server.db")
 	os.RemoveAll("keystore")
 	os.RemoveAll("msp")
@@ -444,7 +444,7 @@ func TestClean(t *testing.T) {
 	os.Remove("../../testdata/ca-cert.pem")
 	os.Remove("../../testdata/IssuerSecretKey")
 	os.Remove("../../testdata/IssuerPublicKey")
-	os.Remove("../../testdata/RevocationPublicKey")
+	os.Remove("../../testdata/IssuerRevocationPublicKey")
 	os.RemoveAll(ldapTestDir)
 	os.RemoveAll("testregattr")
 }
@@ -453,7 +453,7 @@ func cleanUpMultiCAFiles() {
 	caFolder := "../../testdata/ca/rootca"
 	nestedFolders := []string{"ca1", "ca2"}
 	removeFiles := []string{"msp", "ca-cert.pem", "ca-key.pem", "fabric-ca-server.db",
-		"fabric-ca2-server.db", "IssuerSecretKey", "IssuerPublicKey", "RevocationPublicKey"}
+		"fabric-ca2-server.db", "IssuerSecretKey", "IssuerPublicKey", "IssuerRevocationPublicKey"}
 
 	for _, nestedFolder := range nestedFolders {
 		path := filepath.Join(caFolder, nestedFolder)

diff --git a/docs/source/deployguide/cadeploy.md b/docs/source/deployguide/cadeploy.md
@@ -311,7 +311,7 @@ Because you've already registered and enrolled your organization CA bootstrap id
             ├── rcaadmin
               ├── msp
                  ├── IssuerPublicKey
-                 ├── RevocationPublicKey
+                 ├── IssuerRevocationPublicKey
                  ├── cacerts
                  ├── keystore
                      └── key.pem
@@ -412,7 +412,7 @@ The folder structure we are using for these commands is:
            └── cert.pem
        ├── user
        ├── IssuerPublicKey
-       └── RevocationPublicKey       
+       └── IssuerRevocationPublicKey       
     ```
 
    Where:
@@ -473,7 +473,7 @@ The resulting folder structure is similar to the following structure. (Some fold
                ├── tlscacerts
                ├── user
                ├── IssuerPublicKey
-               └── RevocationPublicKey
+               └── IssuerRevocationPublicKey
   fabric-ca-server-int-ca
     └── tls
       └── tls-ca-cert.pem

diff --git a/docs/source/operations_guide.rst b/docs/source/operations_guide.rst
@@ -235,7 +235,7 @@ issued form the CA. You will see files such as the ones below:
    ├── fabric-ca-client-config.yaml
    └── msp
       ├── IssuerPublicKey
-      ├── RevocationPublicKey
+      ├── IssuerRevocationPublicKey
       ├── cacerts
       │   └── 0-0-0-0-7053.pem
       ├── keystore

diff --git a/go.mod b/go.mod
@@ -16,7 +16,6 @@ require (
 	github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
 	github.com/hyperledger/fabric v1.4.11
 	github.com/hyperledger/fabric-lib-go v1.0.0
-	github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c
 	github.com/jinzhu/copier v0.3.5
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46

diff --git a/go.sum b/go.sum
@@ -97,7 +97,6 @@ github.com/hyperledger/fabric-amcl v0.0.0-20210603140002-2670f91851c8 h1:BCR8ZlO
 github.com/hyperledger/fabric-amcl v0.0.0-20210603140002-2670f91851c8/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
 github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1QI2emOVc324=
 github.com/hyperledger/fabric-lib-go v1.0.0/go.mod h1:H362nMlunurmHwkYqR5uHL2UDWbQdbfz74n8kbCFsqc=
-github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c h1:QPhSriw6EzMOj/d7gcGiKEvozVvQ5HLk9UWie4KAvSs=
 github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=

diff --git a/lib/ca.go b/lib/ca.go
@@ -1014,7 +1014,7 @@ func (ca *CA) fillCAInfo(info *api.CAInfoResponseNet) error {
 		return err
 	}
 	info.IssuerPublicKey = util.B64Encode(ipkBytes)
-	info.RevocationPublicKey = util.B64Encode(rpkBytes)
+	info.IssuerRevocationPublicKey = util.B64Encode(rpkBytes)
 	return nil
 }
 

diff --git a/lib/client.go b/lib/client.go
@@ -73,7 +73,7 @@ type GetCAInfoResponse struct {
 	// Idemix issuer public key of the CA
 	IssuerPublicKey []byte
 	// Idemix issuer revocation public key of the CA
-	RevocationPublicKey []byte
+	IssuerRevocationPublicKey []byte
 	// Version of the server
 	Version string
 }
@@ -308,12 +308,12 @@ func (c *Client) net2LocalCAInfo(net *api.CAInfoResponseNet, local *GetCAInfoRes
 		}
 		local.IssuerPublicKey = ipk
 	}
-	if net.RevocationPublicKey != "" {
-		rpk, err := util.B64Decode(net.RevocationPublicKey)
+	if net.IssuerRevocationPublicKey != "" {
+		rpk, err := util.B64Decode(net.IssuerRevocationPublicKey)
 		if err != nil {
 			return errors.WithMessage(err, "Failed to decode issuer revocation key")
 		}
-		local.RevocationPublicKey = rpk
+		local.IssuerRevocationPublicKey = rpk
 	}
 	local.CAName = net.CAName
 	local.CAChain = caChain
@@ -517,6 +517,7 @@ func (c *Client) newIdemixEnrollmentResponse(identity *Identity, result *api.Ide
 	ou, _ := result.Attrs["OU"].(string)
 	enrollmentID, _ := result.Attrs["EnrollmentID"].(string)
 	signerConfig := &idemixcred.SignerConfig{
+		CurveID:                         cidemix.Curves.ByID(c.curveID),
 		Cred:                            credBytes,
 		Sk:                              sk.Bytes(),
 		Role:                            role,

diff --git a/lib/client/credential/idemix/credential.go b/lib/client/credential/idemix/credential.go
@@ -19,7 +19,6 @@ import (
 	"github.com/hyperledger/fabric-ca/api"
 	idemix4 "github.com/hyperledger/fabric-ca/lib/common/idemix"
 	"github.com/hyperledger/fabric-ca/util"
-	m "github.com/hyperledger/fabric-protos-go/msp"
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/pkg/errors"
 )
@@ -89,16 +88,7 @@ func (cred *Credential) Store() error {
 	if err != nil {
 		return err
 	}
-	caSignerConfig := val.(*SignerConfig)
-	mspSignerConfig := &m.IdemixMSPSignerConfig{
-		Cred:                            caSignerConfig.Cred,
-		Sk:                              caSignerConfig.Sk,
-		OrganizationalUnitIdentifier:    caSignerConfig.OrganizationalUnitIdentifier,
-		Role:                            int32(caSignerConfig.Role),
-		EnrollmentId:                    caSignerConfig.EnrollmentID,
-		CredentialRevocationInformation: caSignerConfig.CredentialRevocationInformation,
-	}
-	signerConfigBytes, err := proto.Marshal(mspSignerConfig)
+	signerConfigBytes, err := json.Marshal(val)
 	if err != nil {
 		return errors.Wrapf(err, "Failed to marshal SignerConfig")
 	}
@@ -118,31 +108,14 @@ func (cred *Credential) Load() error {
 		log.Debugf("No credential found at %s: %s", cred.signerConfigFile, err.Error())
 		return err
 	}
-
-	// Load the MSP signer config
-	var val SignerConfig
-	mspSignerConfig := &m.IdemixMSPSignerConfig{}
-	err = proto.Unmarshal(signerConfigBytes, mspSignerConfig)
-	if err == nil {
-		val = SignerConfig{
-			Cred:                            mspSignerConfig.Cred,
-			Sk:                              mspSignerConfig.Sk,
-			OrganizationalUnitIdentifier:    mspSignerConfig.OrganizationalUnitIdentifier,
-			Role:                            int(mspSignerConfig.Role),
-			EnrollmentID:                    mspSignerConfig.EnrollmentId,
-			CredentialRevocationInformation: mspSignerConfig.CredentialRevocationInformation,
-		}
-	}
-
+	val := SignerConfig{}
+	err = json.Unmarshal(signerConfigBytes, &val)
 	if err != nil {
-		// try to unmarshal via json
-		val = SignerConfig{}
-		err = json.Unmarshal(signerConfigBytes, &val)
-		if err != nil {
-			return errors.Wrapf(err, fmt.Sprintf("Failed to unmarshal SignerConfig bytes from %s", cred.signerConfigFile))
-		}
+		return errors.Wrapf(err, fmt.Sprintf("Failed to unmarshal SignerConfig bytes from %s", cred.signerConfigFile))
+	}
+	if val.CurveID == "" {
+		val.CurveID = idemix4.DefaultIdemixCurve
 	}
-
 	cred.val = &val
 	return nil
 }

diff --git a/lib/client/credential/idemix/signerconfig.go b/lib/client/credential/idemix/signerconfig.go
@@ -20,6 +20,8 @@ type SignerConfig struct {
 	EnrollmentID string `protobuf:"bytes,5,opt,name=enrollment_id,json=enrollmentId" json:"enrollment_id,omitempty"`
 	// CRI contains a serialized Credential Revocation Information
 	CredentialRevocationInformation []byte `protobuf:"bytes,6,opt,name=credential_revocation_information,json=credentialRevocationInformation,proto3" json:"credential_revocation_information,omitempty"`
+	// CurveID specifies the name of the Idemix curve to use, defaults to 'amcl.Fp256bn'
+	CurveID string `protobuf:"bytes,7,opt,name=curve_id,json=curveID" json:"curveID,omitempty"`
 }
 
 // GetCred returns credential associated with this signer config

diff --git a/lib/server/idemix/config.go b/lib/server/idemix/config.go
@@ -18,9 +18,9 @@ const (
 	// DefaultIssuerSecretKeyFile is the default name of the file that contains issuer secret key
 	DefaultIssuerSecretKeyFile = "IssuerSecretKey"
 	// DefaultRevocationPublicKeyFile is the name of the file where revocation public key is stored
-	DefaultRevocationPublicKeyFile = "RevocationPublicKey"
+	DefaultRevocationPublicKeyFile = "IssuerRevocationPublicKey"
 	// DefaultRevocationPrivateKeyFile is the name of the file where revocation private key is stored
-	DefaultRevocationPrivateKeyFile = "RevocationPrivateKey"
+	DefaultRevocationPrivateKeyFile = "IssuerRevocationPrivateKey"
 	// KeystoreDir is the keystore directory where all keys are stored. It is relative to the server home directory.
 	KeystoreDir = "msp/keystore"
 )
@@ -30,8 +30,8 @@ type Config struct {
 	Curve                    string `def:"amcl.Fp256bn" help:"Name of the curve among {'amcl.Fp256bn', 'gurvy.Bn254', 'amcl.Fp256Miraclbn'}, defaults to 'amcl.Fp256bn'"`
 	IssuerPublicKeyfile      string `def:"IssuerPublicKey" skip:"true" help:"Name of the file that contains marshalled bytes of CA's Idemix issuer public key"`
 	IssuerSecretKeyfile      string `def:"IssuerSecretKey" skip:"true" help:"Name of the file that contains CA's Idemix issuer secret key"`
-	RevocationPublicKeyfile  string `def:"RevocationPublicKey" skip:"true" help:"Name of the file that contains Idemix issuer revocation public key"`
-	RevocationPrivateKeyfile string `def:"RevocationPrivateKey" skip:"true" help:"Name of the file that contains Idemix issuer revocation private key"`
+	RevocationPublicKeyfile  string `def:"IssuerRevocationPublicKey" skip:"true" help:"Name of the file that contains Idemix issuer revocation public key"`
+	RevocationPrivateKeyfile string `def:"IssuerRevocationPrivateKey" skip:"true" help:"Name of the file that contains Idemix issuer revocation private key"`
 	RHPoolSize               int    `def:"100" help:"Specifies revocation handle pool size"`
 	NonceExpiration          string `def:"15s" help:"Duration after which a nonce expires"`
 	NonceSweepInterval       string `def:"15m" help:"Interval at which expired nonces are deleted"`

diff --git a/lib/server_test.go b/lib/server_test.go
@@ -1238,7 +1238,7 @@ func TestSRVMultiCAWithIntermediate(t *testing.T) {
 		if err != nil {
 			t.Errorf("RemoveAll failed: %s", err)
 		}
-		err = os.RemoveAll("../testdata/RevocationPublicKey")
+		err = os.RemoveAll("../testdata/IssuerRevocationPublicKey")
 		if err != nil {
 			t.Errorf("RemoveAll failed: %s", err)
 		}
@@ -2399,7 +2399,7 @@ func cleanMultiCADir(t *testing.T) {
 	toplevelFolders := []string{"intermediateca", "rootca"}
 	nestedFolders := []string{"ca1", "ca2", "ca3"}
 	removeFiles := []string{"ca-cert.pem", "ca-key.pem", "fabric-ca-server.db",
-		"fabric-ca2-server.db", "ca-chain.pem", "IssuerPublicKey", "IssuerSecretKey", "RevocationPublicKey"}
+		"fabric-ca2-server.db", "ca-chain.pem", "IssuerPublicKey", "IssuerSecretKey", "IssuerRevocationPublicKey"}
 
 	for _, topFolder := range toplevelFolders {
 		for _, nestedFolder := range nestedFolders {

diff --git a/swagger/openapi.json b/swagger/openapi.json
@@ -55,7 +55,7 @@
                           "type": "string",
                           "description": "Base 64 encoding of proto bytes of the CA's Idemix issuer public key"
                         },
-                        "RevocationPublicKey": {
+                        "IssuerRevocationPublicKey": {
                           "type": "string",
                           "description": "Base 64 encoding of PEM-encoded bytes of the CA's Idemix issuer revocation public key"
                         },
@@ -166,7 +166,7 @@
                             "CAChain",
                             "CAName",
                             "IssuerPublicKey",
-                            "RevocationPublicKey",
+                            "IssuerRevocationPublicKey",
                             "Version"
                           ],
                           "type": "object",
@@ -183,7 +183,7 @@
                               "type": "string",
                               "description": "Base 64 encoding of proto bytes of the CA's Idemix issuer public key"
                             },
-                            "RevocationPublicKey": {
+                            "IssuerRevocationPublicKey": {
                               "type": "string",
                               "description": "Base 64 encoding of PEM-encoded bytes of the CA's Idemix issuer revocation public key"
                             },
@@ -302,7 +302,7 @@
                             "CAChain",
                             "CAName",
                             "IssuerPublicKey",
-                            "RevocationPublicKey",
+                            "IssuerRevocationPublicKey",
                             "Version"
                           ],
                           "type": "object",
@@ -319,7 +319,7 @@
                               "type": "string",
                               "description": "Base 64 encoding of proto bytes of the CA's Idemix issuer public key"
                             },
-                            "RevocationPublicKey": {
+                            "IssuerRevocationPublicKey": {
                               "type": "string",
                               "description": "Base 64 encoding of PEM-encoded bytes of the CA's Idemix issuer revocation public key"
                             },
@@ -500,7 +500,7 @@
                             "CAChain",
                             "CAName",
                             "IssuerPublicKey",
-                            "RevocationPublicKey",
+                            "IssuerRevocationPublicKey",
                             "Version"
                           ],
                           "type": "object",
@@ -517,7 +517,7 @@
                               "type": "string",
                               "description": "Base 64 encoding of proto bytes of the CA's Idemix issuer public key"
                             },
-                            "RevocationPublicKey": {
+                            "IssuerRevocationPublicKey": {
                               "type": "string",
                               "description": "Base 64 encoding of PEM-encoded bytes of the CA's Idemix issuer revocation public key"
                             },