[FAB-6485] Add capabilities hook for MSP version

The MSP framework needs to know which version of MSP semantics to use
for principal evaluation etc.  This needs to be determined based on the
capabilities defined by the channel.  This CR adds a new method to the
capabilities interface for the channel which returns an MSP version.

It also modifies the MSPConfigHandler to accept this version, but for
the time being, does nothing with it.  There is a TODO left in the code
for where this flag should be used by the new MSP code which consumes
it.

Change-Id: Ic23be11b6814ae830ebd113442c365f7dd58de9b
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

common/capabilities/channel.go

@@ -12,17 +12,33 @@ import (
 
 const (
 	channelTypeName = "Channel"
+
+	// ChannelV1_1 is the capabilties string for standard new non-backwards compatible fabric v1.1 channel capabilities.
+	ChannelV1_1 = "V1.1"
+)
+
+// MSPVersion is used to communicate the level of the Channel MSP to the MSP implementations.
+type MSPVersion int
+
+const (
+	// MSPv1_0 is the version of the MSP framework shipped with v1.0.x of fabric.
+	MSPv1_0 = iota
+
+	// MSPv1_1 is the version of the MSP framework enabled in v1.1.0 of fabric.
+	MSPv1_1
 )
 
 // ChannelProvider provides capabilities information for channel level config.
 type ChannelProvider struct {
 	*registry
+	v11 bool
 }
 
 // NewChannelProvider creates a channel capabilities provider.
 func NewChannelProvider(capabilities map[string]*cb.Capability) *ChannelProvider {
 	cp := &ChannelProvider{}
 	cp.registry = newRegistry(cp, capabilities)
+	_, cp.v11 = capabilities[ChannelV1_1]
 	return cp
 }
 
@@ -35,7 +51,19 @@ func (cp *ChannelProvider) Type() string {
 func (cp *ChannelProvider) HasCapability(capability string) bool {
 	switch capability {
 	// Add new capability names here
+	case ChannelV1_1:
+		return true
 	default:
 		return false
 	}
 }
+
+// MSPVersion returns the level of MSP support required by this channel.
+func (cp *ChannelProvider) MSPVersion() MSPVersion {
+	switch {
+	case cp.v11:
+		return MSPv1_1
+	default:
+		return MSPv1_0
+	}
+}

common/capabilities/channel_test.go

@@ -0,0 +1,29 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package capabilities
+
+import (
+	"testing"
+
+	cb "github.com/hyperledger/fabric/protos/common"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestChannelV10(t *testing.T) {
+	op := NewChannelProvider(map[string]*cb.Capability{})
+	assert.NoError(t, op.Supported())
+	assert.True(t, op.MSPVersion() == MSPv1_0)
+}
+
+func TestChannelV11(t *testing.T) {
+	op := NewChannelProvider(map[string]*cb.Capability{
+		ChannelV1_1: &cb.Capability{},
+	})
+	assert.NoError(t, op.Supported())
+	assert.True(t, op.MSPVersion() == MSPv1_1)
+}

common/channelconfig/api.go

@@ -9,6 +9,7 @@ package channelconfig
 import (
 	"time"
 
+	"github.com/hyperledger/fabric/common/capabilities"
 	configtxapi "github.com/hyperledger/fabric/common/configtx/api"
 	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/msp"
@@ -105,6 +106,10 @@ type Orderer interface {
 type ChannelCapabilities interface {
 	// Supported returns an error if there are unknown capabilities in this channel which are required
 	Supported() error
+
+	// MSPVersion specifies the version of the MSP this channel must understand, including the MSP types
+	// and MSP principal types.
+	MSPVersion() capabilities.MSPVersion
 }
 
 // ApplicationCapabilities defines the capabilities for the application portion of a channel

common/channelconfig/channel.go

@@ -83,8 +83,6 @@ func NewChannelConfig(channelGroup *cb.ConfigGroup) (*ChannelConfig, error) {
 		protos: &ChannelProtos{},
 	}
 
-	mspConfigHandler := NewMSPConfigHandler()
-
 	if err := DeserializeProtoValuesFromGroup(channelGroup, cc.protos); err != nil {
 		return nil, errors.Wrap(err, "failed to deserialize values")
 	}
@@ -93,6 +91,9 @@ func NewChannelConfig(channelGroup *cb.ConfigGroup) (*ChannelConfig, error) {
 		return nil, err
 	}
 
+	capabilities := cc.Capabilities()
+	mspConfigHandler := NewMSPConfigHandler(capabilities.MSPVersion())
+
 	var err error
 	for groupName, group := range channelGroup.Groups {
 		switch groupName {

common/channelconfig/consortium_test.go

@@ -8,12 +8,14 @@ package channelconfig
 import (
 	"testing"
 
+	"github.com/hyperledger/fabric/common/capabilities"
 	cb "github.com/hyperledger/fabric/protos/common"
+
 	"github.com/stretchr/testify/assert"
 )
 
 func TestConsortiumConfig(t *testing.T) {
-	cc, err := NewConsortiumConfig(&cb.ConfigGroup{}, NewMSPConfigHandler())
+	cc, err := NewConsortiumConfig(&cb.ConfigGroup{}, NewMSPConfigHandler(capabilities.MSPv1_0))
 	assert.NoError(t, err)
 	orgs := cc.Organizations()
 	assert.Equal(t, 0, len(orgs))

common/channelconfig/msp.go

@@ -9,6 +9,7 @@ package channelconfig
 import (
 	"fmt"
 
+	"github.com/hyperledger/fabric/common/capabilities"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/msp/cache"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"
@@ -23,17 +24,21 @@ type pendingMSPConfig struct {
 
 // MSPConfigHandler
 type MSPConfigHandler struct {
-	idMap map[string]*pendingMSPConfig
+	version capabilities.MSPVersion
+	idMap   map[string]*pendingMSPConfig
 }
 
-func NewMSPConfigHandler() *MSPConfigHandler {
+func NewMSPConfigHandler(mspVersion capabilities.MSPVersion) *MSPConfigHandler {
 	return &MSPConfigHandler{
-		idMap: make(map[string]*pendingMSPConfig),
+		version: mspVersion,
+		idMap:   make(map[string]*pendingMSPConfig),
 	}
 }
 
 // ProposeValue called when an org defines an MSP
 func (bh *MSPConfigHandler) ProposeMSP(mspConfig *mspprotos.MSPConfig) (msp.MSP, error) {
+	// TODO utilize bh.version to initialize the MSP
+
 	// check that the type for that MSP is supported
 	if mspConfig.Type != int32(msp.FABRIC) {
 		return nil, fmt.Errorf("Setup error: unsupported msp type %d", mspConfig.Type)

common/channelconfig/msp_test.go

@@ -9,6 +9,7 @@ package channelconfig
 import (
 	"testing"
 
+	"github.com/hyperledger/fabric/common/capabilities"
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/msp"
@@ -26,7 +27,7 @@ func TestMSPConfigManager(t *testing.T) {
 
 	// test success:
 
-	mspCH := NewMSPConfigHandler()
+	mspCH := NewMSPConfigHandler(capabilities.MSPv1_0)
 
 	_, err = mspCH.ProposeMSP(conf)
 	assert.NoError(t, err)
@@ -44,7 +45,7 @@ func TestMSPConfigManager(t *testing.T) {
 }
 
 func TestMSPConfigFailure(t *testing.T) {
-	mspCH := NewMSPConfigHandler()
+	mspCH := NewMSPConfigHandler(capabilities.MSPv1_0)
 
 	// begin/propose/commit
 	t.Run("Bad proto", func(t *testing.T) {

common/mocks/config/channel.go

@@ -17,6 +17,7 @@ limitations under the License.
 package config
 
 import (
+	"github.com/hyperledger/fabric/common/capabilities"
 	"github.com/hyperledger/fabric/common/channelconfig"
 	"github.com/hyperledger/fabric/common/util"
 )
@@ -64,9 +65,17 @@ func (scm *Channel) Capabilities() channelconfig.ChannelCapabilities {
 type ChannelCapabilities struct {
 	// SupportedErr is returned by Supported()
 	SupportedErr error
+
+	// MSPVersionVal is returned by MSPVersion()
+	MSPVersionVal capabilities.MSPVersion
 }
 
 // Supported returns SupportedErr
-func (oc *ChannelCapabilities) Supported() error {
-	return oc.SupportedErr
+func (cc *ChannelCapabilities) Supported() error {
+	return cc.SupportedErr
+}
+
+// MSPVersion returns MSPVersionVal
+func (cc *ChannelCapabilities) MSPVersion() capabilities.MSPVersion {
+	return cc.MSPVersionVal
 }

orderer/common/multichannel/registrar_test.go

@@ -292,7 +292,7 @@ func TestResourcesCheck(t *testing.T) {
 				CapabilitiesVal: &mockchannelconfig.OrdererCapabilities{},
 			},
 			ChannelConfigVal: &mockchannelconfig.Channel{
-				CapabilitiesVal: &mockchannelconfig.OrdererCapabilities{},
+				CapabilitiesVal: &mockchannelconfig.ChannelCapabilities{},
 			},
 		})