[FAB-3926] Add tests to CSCC to validate inputs

Added new tests cases to validate various cases of incorrect input as
well, removed code duplicates, hence increase code coverage of CSCC
package to 86%.

Change-Id: I3dd2d7b512e07de7fb114208d906b968db7737a1
Signed-off-by: Artem Barger <[email protected]>

Author: C0rWin

core/scc/cscc/configure.go

@@ -22,6 +22,7 @@ limitations under the License.
 package cscc
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
@@ -32,6 +33,7 @@ import (
 	"github.com/hyperledger/fabric/core/policy"
 	"github.com/hyperledger/fabric/events/producer"
 	"github.com/hyperledger/fabric/msp/mgmt"
+	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
 )
@@ -145,11 +147,7 @@ func (e *PeerConfiger) Invoke(stub shim.ChaincodeStubInterface) pb.Response {
 // Since it is the first block, it is the genesis block containing configuration
 // for this chain, so we want to update the Chain object with this info
 func joinChain(blockBytes []byte) pb.Response {
-	if blockBytes == nil {
-		return shim.Error("Genesis block must not be nil.")
-	}
-
-	block, err := utils.GetBlockFromBlockBytes(blockBytes)
+	block, err := extractBlock(blockBytes)
 	if err != nil {
 		return shim.Error(fmt.Sprintf("Failed to reconstruct the genesis block, %s", err))
 	}
@@ -173,10 +171,7 @@ func joinChain(blockBytes []byte) pb.Response {
 }
 
 func updateConfigBlock(blockBytes []byte) pb.Response {
-	if blockBytes == nil {
-		return shim.Error("Configuration block must not be nil.")
-	}
-	block, err := utils.GetBlockFromBlockBytes(blockBytes)
+	block, err := extractBlock(blockBytes)
 	if err != nil {
 		return shim.Error(fmt.Sprintf("Failed to reconstruct the configuration block, %s", err))
 	}
@@ -193,6 +188,19 @@ func updateConfigBlock(blockBytes []byte) pb.Response {
 	return shim.Success(nil)
 }
 
+func extractBlock(bytes []byte) (*common.Block, error) {
+	if bytes == nil {
+		return nil, errors.New("Genesis block must not be nil.")
+	}
+
+	block, err := utils.GetBlockFromBlockBytes(bytes)
+	if err != nil {
+		return nil, errors.New(fmt.Sprintf("Failed to reconstruct the genesis block, %s", err))
+	}
+
+	return block, nil
+}
+
 // Return the current configuration block for the specified chainID. If the
 // peer doesn't belong to the chain, return error
 func getConfigBlock(chainID []byte) pb.Response {

core/scc/cscc/configure_test.go

@@ -90,6 +90,33 @@ func TestConfigerInit(t *testing.T) {
 	}
 }
 
+func TestConfigerInvokeInvalidParameters(t *testing.T) {
+	e := new(PeerConfiger)
+	stub := shim.NewMockStub("PeerConfiger", e)
+
+	res := stub.MockInit("1", nil)
+	assert.Equal(t, res.Status, int32(shim.OK), "Init failed")
+
+	res = stub.MockInvoke("2", nil)
+	assert.Equal(t, res.Status, int32(shim.ERROR), "CSCC invoke expected to fail having zero arguments")
+	assert.Equal(t, res.Message, "Incorrect number of arguments, 0")
+
+	args := [][]byte{[]byte("GetChannels")}
+	res = stub.MockInvokeWithSignedProposal("3", args, nil)
+	assert.Equal(t, res.Status, int32(shim.ERROR), "CSCC invoke expected to fail no signed proposal provided")
+	assert.Contains(t, res.Message, "failed authorization check")
+
+	args = [][]byte{[]byte("GetConfigBlock"), []byte("testChainID")}
+	res = stub.MockInvokeWithSignedProposal("4", args, nil)
+	assert.Equal(t, res.Status, int32(shim.ERROR), "CSCC invoke expected to fail no signed proposal provided")
+	assert.Contains(t, res.Message, "failed authorization check")
+
+	args = [][]byte{[]byte("fooFunction"), []byte("testChainID")}
+	res = stub.MockInvoke("5", args)
+	assert.Equal(t, res.Status, int32(shim.ERROR), "CSCC invoke expected wrong function name provided")
+	assert.Equal(t, res.Message, "Requested function fooFunction not found.")
+}
+
 func TestConfigerInvokeJoinChainMissingParams(t *testing.T) {
 	viper.Set("peer.fileSystemPath", "/tmp/hyperledgertest/")
 	os.Mkdir("/tmp/hyperledgertest", 0755)
@@ -103,7 +130,7 @@ func TestConfigerInvokeJoinChainMissingParams(t *testing.T) {
 		t.FailNow()
 	}
 
-	// Failed path: Not enough parameters
+	// Failed path: expected to have at least one argument
 	args := [][]byte{[]byte("JoinChain")}
 	if res := stub.MockInvoke("2", args); res.Status == shim.OK {
 		t.Fatalf("cscc invoke JoinChain should have failed with invalid number of args: %v", args)
@@ -181,13 +208,19 @@ func TestConfigerInvokeJoinChainCorrectParams(t *testing.T) {
 	sProp, _ := utils.MockSignedEndorserProposalOrPanic("", &pb.ChaincodeSpec{}, []byte("Alice"), []byte("msg1"))
 	identityDeserializer.Msg = sProp.ProposalBytes
 	sProp.Signature = sProp.ProposalBytes
+
+	// Try fail path with nil block
+	res := stub.MockInvokeWithSignedProposal("2", [][]byte{[]byte("JoinChain"), nil}, sProp)
+	assert.Equal(t, res.Status, int32(shim.ERROR))
+
+	// Now, continue with valid execution path
 	if res := stub.MockInvokeWithSignedProposal("2", args, sProp); res.Status != shim.OK {
 		t.Fatalf("cscc invoke JoinChain failed with: %v", res.Message)
 	}
 
 	// This call must fail
 	sProp.Signature = nil
-	res := stub.MockInvokeWithSignedProposal("3", args, sProp)
+	res = stub.MockInvokeWithSignedProposal("3", args, sProp)
 	if res.Status == shim.OK {
 		t.Fatalf("cscc invoke JoinChain must fail : %v", res.Message)
 	}