[FAB-2325] Add reader/writer/admin to orgs

https://jira.hyperledger.org/browse/FAB-2325

This CR adds automatic encoding of a reader/writer/admin policy for each
MSP created via the MSP templating tool.

In combination with the default reader/writer/admin policies at the
group level from [FAB-2324] the reader/writer/admin policies should be
ready to be consumed by other parts of the system.

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

common/cauthdsl/cauthdsl_builder.go

@@ -92,6 +92,24 @@ func SignedByMspMember(mspId string) *cb.SignaturePolicyEnvelope {
 	return p
 }
 
+// SignedByMspAdmin creates a SignaturePolicyEnvelope
+// requiring 1 signature from any admin of the specified MSP
+func SignedByMspAdmin(mspId string) *cb.SignaturePolicyEnvelope {
+	// specify the principal: it's a member of the msp we just found
+	principal := &cb.MSPPrincipal{
+		PrincipalClassification: cb.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&cb.MSPRole{Role: cb.MSPRole_ADMIN, MspIdentifier: mspId})}
+
+	// create the policy: it requires exactly 1 signature from the first (and only) principal
+	p := &cb.SignaturePolicyEnvelope{
+		Version:    0,
+		Policy:     NOutOf(1, []*cb.SignaturePolicy{SignedBy(0)}),
+		Identities: []*cb.MSPPrincipal{principal},
+	}
+
+	return p
+}
+
 // And is a convenience method which utilizes NOutOf to produce And equivalent behavior
 func And(lhs, rhs *cb.SignaturePolicy) *cb.SignaturePolicy {
 	return NOutOf(2, []*cb.SignaturePolicy{lhs, rhs})

common/configtx/tool/provisional/provisional.go

@@ -25,6 +25,7 @@ import (
 	configtxchannel "github.com/hyperledger/fabric/common/configvalues/channel"
 	configtxapplication "github.com/hyperledger/fabric/common/configvalues/channel/application"
 	configtxorderer "github.com/hyperledger/fabric/common/configvalues/channel/orderer"
+	configvaluesmsp "github.com/hyperledger/fabric/common/configvalues/msp"
 	"github.com/hyperledger/fabric/common/genesis"
 	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/orderer/common/bootstrap"
@@ -56,15 +57,6 @@ const (
 
 	// AcceptAllPolicyKey is the key of the AcceptAllPolicy.
 	AcceptAllPolicyKey = "AcceptAllPolicy"
-
-	// ReadersPolicyKey is the key used for the read policy
-	ReadersPolicyKey = "Readers"
-
-	// WritersPolicyKey is the key used for the read policy
-	WritersPolicyKey = "Writers"
-
-	// AdminsPolicyKey is the key used for the read policy
-	AdminsPolicyKey = "Admins"
 )
 
 // DefaultChainCreationPolicyNames is the default value of ChainCreatorsKey.
@@ -99,19 +91,19 @@ func New(conf *genesisconfig.TopLevel) Generator {
 			cauthdsl.TemplatePolicy(AcceptAllPolicyKey, cauthdsl.AcceptAllPolicy),
 
 			// Initialize the default Reader/Writer/Admins channel policies
-			policies.TemplateImplicitMetaAnyPolicy([]string{}, ReadersPolicyKey),
-			policies.TemplateImplicitMetaAnyPolicy([]string{}, WritersPolicyKey),
-			policies.TemplateImplicitMetaMajorityPolicy([]string{}, AdminsPolicyKey),
+			policies.TemplateImplicitMetaAnyPolicy([]string{}, configvaluesmsp.ReadersPolicyKey),
+			policies.TemplateImplicitMetaAnyPolicy([]string{}, configvaluesmsp.WritersPolicyKey),
+			policies.TemplateImplicitMetaMajorityPolicy([]string{}, configvaluesmsp.AdminsPolicyKey),
 
 			// Initialize the default Reader/Writer/Admins orderer policies
-			policies.TemplateImplicitMetaAnyPolicy([]string{configtxorderer.GroupKey}, ReadersPolicyKey),
-			policies.TemplateImplicitMetaAnyPolicy([]string{configtxorderer.GroupKey}, WritersPolicyKey),
-			policies.TemplateImplicitMetaMajorityPolicy([]string{configtxorderer.GroupKey}, AdminsPolicyKey),
+			policies.TemplateImplicitMetaAnyPolicy([]string{configtxorderer.GroupKey}, configvaluesmsp.ReadersPolicyKey),
+			policies.TemplateImplicitMetaAnyPolicy([]string{configtxorderer.GroupKey}, configvaluesmsp.WritersPolicyKey),
+			policies.TemplateImplicitMetaMajorityPolicy([]string{configtxorderer.GroupKey}, configvaluesmsp.AdminsPolicyKey),
 
 			// Initialize the default Reader/Writer/Admins application policies
-			policies.TemplateImplicitMetaAnyPolicy([]string{configtxapplication.GroupKey}, ReadersPolicyKey),
-			policies.TemplateImplicitMetaAnyPolicy([]string{configtxapplication.GroupKey}, WritersPolicyKey),
-			policies.TemplateImplicitMetaMajorityPolicy([]string{configtxapplication.GroupKey}, AdminsPolicyKey),
+			policies.TemplateImplicitMetaAnyPolicy([]string{configtxapplication.GroupKey}, configvaluesmsp.ReadersPolicyKey),
+			policies.TemplateImplicitMetaAnyPolicy([]string{configtxapplication.GroupKey}, configvaluesmsp.WritersPolicyKey),
+			policies.TemplateImplicitMetaMajorityPolicy([]string{configtxapplication.GroupKey}, configvaluesmsp.AdminsPolicyKey),
 		},
 
 		systemChainGroups: []*cb.ConfigGroup{

common/configvalues/msp/config_util.go

@@ -17,25 +17,82 @@ limitations under the License.
 package msp
 
 import (
+	"github.com/hyperledger/fabric/common/cauthdsl"
+	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/msp"
+	mspprotos "github.com/hyperledger/fabric/protos/msp"
 	"github.com/hyperledger/fabric/protos/utils"
+
+	logging "github.com/op/go-logging"
 )
 
+var logger = logging.MustGetLogger("configvalues/msp")
+
 const (
+	// ReadersPolicyKey is the key used for the read policy
+	ReadersPolicyKey = "Readers"
+
+	// WritersPolicyKey is the key used for the read policy
+	WritersPolicyKey = "Writers"
+
+	// AdminsPolicyKey is the key used for the read policy
+	AdminsPolicyKey = "Admins"
+
+	// MSPKey is the org key used for MSP configuration
 	MSPKey = "MSP"
 )
 
 // TemplateGroupMSP creates an MSP ConfigValue at the given configPath
-func TemplateGroupMSP(configPath []string, mspConf *msp.MSPConfig) *cb.ConfigGroup {
+func TemplateGroupMSP(configPath []string, mspConfig *mspprotos.MSPConfig) *cb.ConfigGroup {
+	// check that the type for that MSP is supported
+	if mspConfig.Type != int32(msp.FABRIC) {
+		logger.Panicf("Setup error: unsupported msp type %d", mspConfig.Type)
+	}
+
+	// create the msp instance
+	mspInst, err := msp.NewBccspMsp()
+	if err != nil {
+		logger.Panicf("Creating the MSP manager failed, err %s", err)
+	}
+
+	// set it up
+	err = mspInst.Setup(mspConfig)
+	if err != nil {
+		logger.Panicf("Setting up the MSP manager failed, err %s", err)
+	}
+
+	// add the MSP to the map of pending MSPs
+	mspID, err := mspInst.GetIdentifier()
+	if err != nil {
+		logger.Panicf("Could not extract msp identifier, err %s", err)
+	}
+
+	memberPolicy := &cb.ConfigPolicy{
+		Policy: &cb.Policy{
+			Type:   int32(cb.Policy_SIGNATURE),
+			Policy: utils.MarshalOrPanic(cauthdsl.SignedByMspMember(mspID)),
+		},
+	}
+
+	adminPolicy := &cb.ConfigPolicy{
+		Policy: &cb.Policy{
+			Type:   int32(cb.Policy_SIGNATURE),
+			Policy: utils.MarshalOrPanic(cauthdsl.SignedByMspAdmin(mspID)),
+		},
+	}
+
 	result := cb.NewConfigGroup()
+
 	intermediate := result
 	for _, group := range configPath {
 		intermediate.Groups[group] = cb.NewConfigGroup()
 		intermediate = intermediate.Groups[group]
 	}
 	intermediate.Values[MSPKey] = &cb.ConfigValue{
-		Value: utils.MarshalOrPanic(mspConf),
+		Value: utils.MarshalOrPanic(mspConfig),
 	}
+	intermediate.Policies[AdminsPolicyKey] = adminPolicy
+	intermediate.Policies[ReadersPolicyKey] = memberPolicy
+	intermediate.Policies[WritersPolicyKey] = memberPolicy
 	return result
 }