FAB-13625 Add memberOnlyWrite integration test

Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>
hyperledger · Jan 8, 2020 · 9b25eab · 9b25eab
1 parent 2f80112
commit 9b25eab
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/integration/pvtdata/pvtdata_test.go b/integration/pvtdata/pvtdata_test.go
@@ -266,7 +266,7 @@ var _ bool = Describe("PrivateData", func() {
 				By("verifying that marble1 still not purged in collection Marbles")
 				assertPresentInCollectionM(network, ccName, "marble1", eligiblePeer)
 
-				By("adding new peer that is eligible to recieve data")
+				By("adding new peer that is eligible to receive data")
 				newPeerProcess = addPeer(network, orderer, org2Peer1)
 				installChaincode(network, testChaincode, org2Peer1)
 				network.VerifyMembership(network.Peers, channelID, ccName)
@@ -500,6 +500,22 @@ var _ bool = Describe("PrivateData", func() {
 					testChaincode.CollectionsConfig = collectionConfig("collections_config3.json")
 					deployChaincode(network, orderer, testChaincode)
 
+					By("attempting to invoke chaincode from a user (org1) not in any collection member orgs (org2 and org3)")
+					peer2 := network.Peer("Org2", "peer0")
+					marbleDetailsBase64 := base64.StdEncoding.EncodeToString([]byte(`{"name":"memberonly-marble", "color":"blue", "size":35, "owner":"tom", "price":99}`))
+					command := commands.ChaincodeInvoke{
+						ChannelID:     channelID,
+						Orderer:       network.OrdererAddress(orderer, nwo.ListenPort),
+						Name:          "marblesp",
+						Ctor:          fmt.Sprintf(`{"Args":["initMarble"]}`),
+						Transient:     fmt.Sprintf(`{"marble":"%s"}`, marbleDetailsBase64),
+						PeerAddresses: []string{network.PeerAddress(peer2, nwo.ListenPort)},
+						WaitForEvent:  true,
+					}
+					peer1 := network.Peer("Org1", "peer0")
+					expectedErrMsg := "tx creator does not have write access permission"
+					invokeChaincodeWithError(network, peer1, command, expectedErrMsg)
+
 					assertMarbleAPIs()
 					assertDeliverWithPrivateDataACLBehavior()
 				})
@@ -516,6 +532,22 @@ var _ bool = Describe("PrivateData", func() {
 					testChaincode.CollectionsConfig = collectionConfig("collections_config3.json")
 					deployChaincode(network, orderer, testChaincode)
 
+					By("attempting to invoke chaincode from a user (org1) not in any collection member orgs (org2 and org3)")
+					peer2 := network.Peer("Org2", "peer0")
+					marbleDetailsBase64 := base64.StdEncoding.EncodeToString([]byte(`{"name":"memberonly-marble", "color":"blue", "size":35, "owner":"tom", "price":99}`))
+					command := commands.ChaincodeInvoke{
+						ChannelID:     channelID,
+						Orderer:       network.OrdererAddress(orderer, nwo.ListenPort),
+						Name:          "marblesp",
+						Ctor:          fmt.Sprintf(`{"Args":["initMarble"]}`),
+						Transient:     fmt.Sprintf(`{"marble":"%s"}`, marbleDetailsBase64),
+						PeerAddresses: []string{network.PeerAddress(peer2, nwo.ListenPort)},
+						WaitForEvent:  true,
+					}
+					peer1 := network.Peer("Org1", "peer0")
+					expectedErrMsg := "tx creator does not have write access permission"
+					invokeChaincodeWithError(network, peer1, command, expectedErrMsg)
+
 					assertMarbleAPIs()
 					assertDeliverWithPrivateDataACLBehavior()
 				})
@@ -811,6 +843,13 @@ func invokeChaincode(n *nwo.Network, peer *nwo.Peer, command commands.ChaincodeI
 	Expect(sess.Err).To(gbytes.Say("Chaincode invoke successful."))
 }
 
+func invokeChaincodeWithError(n *nwo.Network, peer *nwo.Peer, command commands.ChaincodeInvoke, expectedErrMsg string) {
+	sess, err := n.PeerUserSession(peer, "User1", command)
+	Expect(err).NotTo(HaveOccurred())
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(1))
+	Expect(sess.Err).To(gbytes.Say(expectedErrMsg))
+}
+
 func approveChaincodeForMyOrgExpectErr(n *nwo.Network, orderer *nwo.Orderer, chaincode nwo.Chaincode, expectedErrMsg string, peers ...*nwo.Peer) {
 	// used to ensure we only approve once per org
 	approvedOrgs := map[string]bool{}
@@ -1144,7 +1183,7 @@ func loadLocalMSPAt(dir, id, mspType string) (msp.MSP, error) {
 	return thisMSP, nil
 }
 
-// receiveDeliverResponse expectes to receive the BlockAndPrivateData response for the requested block.
+// receiveDeliverResponse expects to receive the BlockAndPrivateData response for the requested block.
 func receiveDeliverResponse(dp pb.Deliver_DeliverWithPrivateDataClient, address string, eventCh chan<- deliverEvent) error {
 	event := deliverEvent{}
 

diff --git a/integration/pvtdata/testdata/collection_configs/collections_config3.json b/integration/pvtdata/testdata/collection_configs/collections_config3.json
@@ -5,14 +5,16 @@
 		"requiredPeerCount": 1,
 		"maxPeerCount": 2,
 		"blockToLive":1000000,
-		"memberOnlyRead": true
+		"memberOnlyRead": true,
+		"memberOnlyWrite": true
 	},
 	{
 		"name": "collectionMarblePrivateDetails",
 		"policy": "OR('Org2MSP.member', 'Org3MSP.member')",
 		"requiredPeerCount": 1,
 		"maxPeerCount": 2,
 		"blockToLive":1000000,
-		"memberOnlyRead": true
+		"memberOnlyRead": true,
+		"memberOnlyWrite": true
 	}
 ]