[FAB-10383] Add support v1.3 MSP

Add new v1.3 MSP version, for which SatisfiesPrincipal will be enhanced
to handle the extended version of MSPPrincipal.

Change-Id: Iaa9181f3ba8f6774ae766425ba7be6ff89415706
Signed-off-by: Mathias Bjoerkqvist <mbj@zurich.ibm.com>

Author: mbjoerkqvist

msp/factory.go

@@ -15,6 +15,7 @@ type MSPVersion int
 const (
 	MSPv1_0 = iota
 	MSPv1_1
+	MSPv1_3
 )
 
 // NewOpts represent
@@ -51,11 +52,15 @@ func New(opts NewOpts) (MSP, error) {
 			return newBccspMsp(MSPv1_0)
 		case MSPv1_1:
 			return newBccspMsp(MSPv1_1)
+		case MSPv1_3:
+			return newBccspMsp(MSPv1_3)
 		default:
 			return nil, errors.Errorf("Invalid *BCCSPNewOpts. Version not recognized [%v]", opts.GetVersion())
 		}
 	case *IdemixNewOpts:
 		switch opts.GetVersion() {
+		case MSPv1_3:
+			fallthrough
 		case MSPv1_1:
 			return newIdemixMsp()
 		default:

msp/msp_test.go

@@ -787,7 +787,7 @@ func TestAdminPolicyPrincipal(t *testing.T) {
 }
 
 func TestAdminPolicyPrincipalFails(t *testing.T) {
-	id, err := localMsp.GetDefaultSigningIdentity()
+	id, err := localMspV13.GetDefaultSigningIdentity()
 	assert.NoError(t, err)
 
 	principalBytes, err := proto.Marshal(&msp.MSPRole{Role: msp.MSPRole_ADMIN, MspIdentifier: "SampleOrg"})
@@ -798,7 +798,7 @@ func TestAdminPolicyPrincipalFails(t *testing.T) {
 		Principal:               principalBytes}
 
 	// remove the admin so validation will fail
-	localMsp.(*bccspmsp).admins = make([]Identity, 0)
+	localMspV13.(*bccspmsp).admins = make([]Identity, 0)
 
 	err = id.SatisfiesPrincipal(principal)
 	assert.Error(t, err)
@@ -924,6 +924,8 @@ func TestIdentityPolicyPrincipalFails(t *testing.T) {
 
 var conf *msp.MSPConfig
 var localMsp MSP
+var localMspV11 MSP
+var localMspV13 MSP
 
 // Required because deleting the cert or msp options from localMsp causes parallel tests to fail
 var localMspBad MSP
@@ -955,6 +957,30 @@ func TestMain(m *testing.M) {
 		os.Exit(-1)
 	}
 
+	localMspV13, err = newBccspMsp(MSPv1_3)
+	if err != nil {
+		fmt.Printf("Constructor for V1.3 msp should have succeeded, got err %s instead", err)
+		os.Exit(-1)
+	}
+
+	localMspV11, err = newBccspMsp(MSPv1_1)
+	if err != nil {
+		fmt.Printf("Constructor for V1.1 msp should have succeeded, got err %s instead", err)
+		os.Exit(-1)
+	}
+
+	err = localMspV11.Setup(conf)
+	if err != nil {
+		fmt.Printf("Setup for V1.1 msp should have succeeded, got err %s instead", err)
+		os.Exit(-1)
+	}
+
+	err = localMspV13.Setup(conf)
+	if err != nil {
+		fmt.Printf("Setup for V1.3 msp should have succeeded, got err %s instead", err)
+		os.Exit(-1)
+	}
+
 	err = localMsp.Setup(conf)
 	if err != nil {
 		fmt.Printf("Setup for msp should have succeeded, got err %s instead", err)

msp/mspimpl.go

@@ -108,6 +108,9 @@ func newBccspMsp(version MSPVersion) (MSP, error) {
 	case MSPv1_1:
 		theMsp.internalSetupFunc = theMsp.setupV11
 		theMsp.internalValidateIdentityOusFunc = theMsp.validateIdentityOUsV11
+	case MSPv1_3:
+		theMsp.internalSetupFunc = theMsp.setupV11
+		theMsp.internalValidateIdentityOusFunc = theMsp.validateIdentityOUsV11
 	default:
 		return nil, errors.Errorf("Invalid MSP version [%v]", version)
 	}