[FAB-11948] check collection exists before meta put

This change set completes the work of [FAB-9997] by performing collection existence checks before allowing metadata puts for keys in that collection. Change-Id: I41acf8d7e42a0e8ef4acd68a0a80dc0977d2de0e Signed-off-by: Alessandro Sorniotti <[email protected]>
hyperledger · Sep 11, 2018 · 8e9d930 · 8e9d930
1 parent 899e0ba
commit 8e9d930
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/collection_val_test.go b/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/collection_val_test.go
@@ -49,3 +49,28 @@ func TestCollectionValidation(t *testing.T) {
 	err = sim.SetPrivateData("ns1", "coll1", "key1", []byte("val1"))
 	assert.NoError(t, err)
 }
+
+func TestPvtGetNoCollection(t *testing.T) {
+	testEnv := testEnvs[0]
+	testEnv.init(t, "test-pvtdata-get-no-collection", nil)
+	defer testEnv.cleanup()
+	txMgr := testEnv.getTxMgr().(*LockBasedTxMgr)
+	queryHelper := newQueryHelper(txMgr, nil)
+	valueHash, metadataBytes, err := queryHelper.getPrivateDataValueHash("cc", "coll", "key")
+	assert.Nil(t, valueHash)
+	assert.Nil(t, metadataBytes)
+	assert.Error(t, err)
+	assert.IsType(t, &errCollConfigNotDefined{}, err)
+}
+
+func TestPvtPutNoCollection(t *testing.T) {
+	testEnv := testEnvs[0]
+	testEnv.init(t, "test-pvtdata-put-no-collection", nil)
+	defer testEnv.cleanup()
+	txMgr := testEnv.getTxMgr().(*LockBasedTxMgr)
+	txsim, err := txMgr.NewTxSimulator("txid")
+	assert.NoError(t, err)
+	err = txsim.SetPrivateDataMetadata("cc", "coll", "key", map[string][]byte{})
+	assert.Error(t, err)
+	assert.IsType(t, &errCollConfigNotDefined{}, err)
+}
diff --git a/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/helper.go b/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/helper.go
@@ -155,6 +155,9 @@ func (h *queryHelper) getPrivateData(ns, coll, key string) ([]byte, error) {
 }
 
 func (h *queryHelper) getPrivateDataValueHash(ns, coll, key string) (valueHash, metadataBytes []byte, err error) {
+	if err := h.validateCollName(ns, coll); err != nil {
+		return nil, nil, err
+	}
 	if err := h.checkDone(); err != nil {
 		return nil, nil, err
 	}

diff --git a/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/lockbased_tx_simulator.go b/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/lockbased_tx_simulator.go
@@ -108,6 +108,9 @@ func (s *lockBasedTxSimulator) GetPrivateDataRangeScanIterator(namespace, collec
 
 // SetPrivateDataMetadata implements method in interface `ledger.TxSimulator`
 func (s *lockBasedTxSimulator) SetPrivateDataMetadata(namespace, collection, key string, metadata map[string][]byte) error {
+	if err := s.helper.validateCollName(namespace, collection); err != nil {
+		return err
+	}
 	if err := s.checkWritePrecondition(key, nil); err != nil {
 		return err
 	}