[FAB-17439] Expose peer's MSPID to chaincode as an env var (#549)

CORE_PEER_LOCALMSPID

Signed-off-by: Danny Cao <dcao@us.ibm.com>

core/container/dockercontroller/dockercontroller.go

@@ -110,6 +110,7 @@ type DockerVM struct {
 	NetworkMode     string
 	PlatformBuilder PlatformBuilder
 	LoggingEnv      []string
+	MSPID           string
 }
 
 // HealthCheck checks if the DockerVM is able to communicate with the Docker
@@ -269,6 +270,8 @@ func (vm *DockerVM) GetEnv(ccid string, tlsConfig *ccintf.TLSConfig) []string {
 		envs = append(envs, "CORE_PEER_TLS_ENABLED=false")
 	}
 
+	envs = append(envs, fmt.Sprintf("CORE_PEER_LOCALMSPID=%s", vm.MSPID))
+
 	return envs
 }
 

core/container/dockercontroller/dockercontroller_test.go

@@ -110,11 +110,12 @@ func TestGetArgs(t *testing.T) {
 func TestGetEnv(t *testing.T) {
 	vm := &DockerVM{
 		LoggingEnv: []string{"LOG_ENV=foo"},
+		MSPID:      "mspid",
 	}
 
 	t.Run("nil TLS config", func(t *testing.T) {
 		env := vm.GetEnv("test", nil)
-		assert.Equal(t, []string{"CORE_CHAINCODE_ID_NAME=test", "LOG_ENV=foo", "CORE_PEER_TLS_ENABLED=false"}, env)
+		assert.Equal(t, []string{"CORE_CHAINCODE_ID_NAME=test", "LOG_ENV=foo", "CORE_PEER_TLS_ENABLED=false", "CORE_PEER_LOCALMSPID=mspid"}, env)
 	})
 
 	t.Run("real TLS config", func(t *testing.T) {
@@ -132,6 +133,7 @@ func TestGetEnv(t *testing.T) {
 			"CORE_TLS_CLIENT_KEY_FILE=/etc/hyperledger/fabric/client_pem.key",
 			"CORE_TLS_CLIENT_CERT_FILE=/etc/hyperledger/fabric/client_pem.crt",
 			"CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/peer.crt",
+			"CORE_PEER_LOCALMSPID=mspid",
 		}, env)
 	})
 }

core/container/externalbuilder/externalbuilder.go

@@ -267,17 +267,19 @@ type Builder struct {
 	Location     string
 	Logger       *flogging.FabricLogger
 	Name         string
+	MSPID        string
 }
 
 // CreateBuilders will construct builders from the peer configuration.
-func CreateBuilders(builderConfs []peer.ExternalBuilder) []*Builder {
+func CreateBuilders(builderConfs []peer.ExternalBuilder, mspid string) []*Builder {
 	var builders []*Builder
 	for _, builderConf := range builderConfs {
 		builders = append(builders, &Builder{
 			Location:     builderConf.Path,
 			Name:         builderConf.Name,
 			EnvWhitelist: builderConf.EnvironmentWhitelist,
 			Logger:       logger.Named(builderConf.Name),
+			MSPID:        mspid,
 		})
 	}
 	return builders
@@ -339,9 +341,10 @@ type runConfig struct {
 	ClientCert  string `json:"client_cert"` // PEM encoded client certificate
 	ClientKey   string `json:"client_key"`  // PEM encoded client key
 	RootCert    string `json:"root_cert"`   // PEM encoded peer chaincode certificate
+	MSPID       string `json:"mspid"`
 }
 
-func newRunConfig(ccid string, peerConnection *ccintf.PeerConnection) runConfig {
+func newRunConfig(ccid string, peerConnection *ccintf.PeerConnection, mspid string) runConfig {
 	var tlsConfig ccintf.TLSConfig
 	if peerConnection.TLSConfig != nil {
 		tlsConfig = *peerConnection.TLSConfig
@@ -353,6 +356,7 @@ func newRunConfig(ccid string, peerConnection *ccintf.PeerConnection) runConfig
 		ClientCert:  string(tlsConfig.ClientCert),
 		ClientKey:   string(tlsConfig.ClientKey),
 		RootCert:    string(tlsConfig.RootCert),
+		MSPID:       mspid,
 	}
 }
 
@@ -364,7 +368,7 @@ func (b *Builder) Run(ccid, bldDir string, peerConnection *ccintf.PeerConnection
 		return nil, errors.WithMessage(err, "could not create temp run dir")
 	}
 
-	rc := newRunConfig(ccid, peerConnection)
+	rc := newRunConfig(ccid, peerConnection, b.MSPID)
 	marshaledRC, err := json.Marshal(rc)
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not marshal run config")

core/container/externalbuilder/externalbuilder_test.go

@@ -104,7 +104,7 @@ var _ = Describe("externalbuilder", func() {
 					{Path: "bad1", Name: "bad1"},
 					{Path: "testdata/goodbuilder", Name: "goodbuilder"},
 					{Path: "bad2", Name: "bad2"},
-				}),
+				}, "mspid"),
 				DurablePath: durablePath,
 			}
 		})
@@ -127,7 +127,7 @@ var _ = Describe("externalbuilder", func() {
 				BeforeEach(func() {
 					detector.Builders = externalbuilder.CreateBuilders([]peer.ExternalBuilder{
 						{Path: "bad1", Name: "bad1"},
-					})
+					}, "mspid")
 				})
 
 				It("returns a nil instance", func() {
@@ -224,6 +224,7 @@ var _ = Describe("externalbuilder", func() {
 				Location: "testdata/goodbuilder",
 				Name:     "goodbuilder",
 				Logger:   logger,
+				MSPID:    "mspid",
 			}
 
 			var err error

core/container/externalbuilder/instance_test.go

@@ -40,6 +40,7 @@ var _ = Describe("Instance", func() {
 			Builder: &externalbuilder.Builder{
 				Location: "testdata/goodbuilder",
 				Logger:   logger,
+				MSPID:    "mspid",
 			},
 		}
 	})

core/container/externalbuilder/testdata/goodbuilder/bin/run

@@ -2,7 +2,7 @@
 
 OUTPUT_JSON="$(jq -S . "$2/chaincode.json")"
 
-EXPECTED_JSON="$(echo '{"chaincode_id":"test-ccid","peer_address":"fake-peer-address","client_cert":"fake-client-cert","client_key":"fake-client-key","root_cert":"fake-root-cert"}' | jq -S .)"
+EXPECTED_JSON="$(echo '{"chaincode_id":"test-ccid","peer_address":"fake-peer-address","client_cert":"fake-client-cert","client_key":"fake-client-key","root_cert":"fake-root-cert","mspid":"mspid"}' | jq -S .)"
 
 if [ "$OUTPUT_JSON" = "$EXPECTED_JSON" ] ; then
     exit 0

integration/externalbuilders/binary/bin/run

@@ -20,6 +20,7 @@ export CORE_PEER_TLS_ENABLED="true"
 export CORE_TLS_CLIENT_CERT_FILE="$ARTIFACTS/client.crt"
 export CORE_TLS_CLIENT_KEY_FILE="$ARTIFACTS/client.key"
 export CORE_PEER_TLS_ROOTCERT_FILE="$ARTIFACTS/root.crt"
+export CORE_PEER_LOCALMSPID="$(jq -r .mspid "$ARTIFACTS/chaincode.json")"
 
 jq -r .client_cert "$ARTIFACTS/chaincode.json" > "$CORE_TLS_CLIENT_CERT_FILE"
 jq -r .client_key  "$ARTIFACTS/chaincode.json" > "$CORE_TLS_CLIENT_KEY_FILE"

internal/peer/node/start.go

@@ -535,14 +535,15 @@ func serve(args []string) error {
 				"CORE_CHAINCODE_LOGGING_SHIM=" + chaincodeConfig.ShimLogLevel,
 				"CORE_CHAINCODE_LOGGING_FORMAT=" + chaincodeConfig.LogFormat,
 			},
+			MSPID: mspID,
 		}
 		if err := opsSystem.RegisterChecker("docker", dockerVM); err != nil {
 			logger.Panicf("failed to register docker health check: %s", err)
 		}
 	}
 
 	externalVM := &externalbuilder.Detector{
-		Builders:    externalbuilder.CreateBuilders(coreConfig.ExternalBuilders),
+		Builders:    externalbuilder.CreateBuilders(coreConfig.ExternalBuilders, mspID),
 		DurablePath: externalBuilderOutput,
 	}