Skip to content

Commit

Permalink
[FAB-9401] sanitize resource names and add doc
Browse files Browse the repository at this point in the history 
Cleans up resource names to be consistent with respect
to case, changes names to be more descriptive where
necessary and adds doc to resource name to indicate where
they are used.

Change-Id: I6d30548c7b5da0f88800a593694e70d1c093057f
Signed-off-by: Srinivasan Muralidharan <srinivasan.muralidharan99@gmail.com>
  • Loading branch information
@muralisrini
muralisrini committed Apr 12, 2018
1 parent 9c51f9f commit 38e3bc1
Show file tree
Hide file tree
Showing 14 changed files with 215 additions and 182 deletions.
10 changes: 5 additions & 5 deletions core/aclmgmt/aclmgmt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestRegisterNilProvider(t *testing.T) {
func TestBadID(t *testing.T) {
reinit()
RegisterACLProvider(nil)
err := GetACLProvider().CheckACL(resources.PROPOSE, "somechain", "badidtype")
err := GetACLProvider().CheckACL(resources.Peer_Propose, "somechain", "badidtype")
assert.Error(t, err, "Expected error")
}

Expand All @@ -65,16 +65,16 @@ func TestWithProvider(t *testing.T) {
reinit()
aclprov := registerACLProvider()
prop := &pb.SignedProposal{}
aclprov.On("CheckACL", resources.PROPOSE, "somechain", prop).Return(nil)
err := GetACLProvider().CheckACL(resources.PROPOSE, "somechain", prop)
aclprov.On("CheckACL", resources.Peer_Propose, "somechain", prop).Return(nil)
err := GetACLProvider().CheckACL(resources.Peer_Propose, "somechain", prop)
assert.NoError(t, err)
}

func TestBadACL(t *testing.T) {
reinit()
aclprov := registerACLProvider()
prop := &pb.SignedProposal{}
aclprov.On("CheckACL", resources.PROPOSE, "somechain", prop).Return(errors.New("badacl"))
err := GetACLProvider().CheckACL(resources.PROPOSE, "somechain", prop)
aclprov.On("CheckACL", resources.Peer_Propose, "somechain", prop).Return(errors.New("badacl"))
err := GetACLProvider().CheckACL(resources.Peer_Propose, "somechain", prop)
assert.Error(t, err, "Expected error")
}
50 changes: 24 additions & 26 deletions core/aclmgmt/defaultaclprovider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,47 +54,45 @@ func (d *defaultACLProvider) initialize() {

//-------------- LSCC --------------
//p resources (implemented by the chaincode currently)
d.pResourcePolicyMap[resources.LSCC_INSTALL] = ""
d.pResourcePolicyMap[resources.LSCC_GETCHAINCODES] = ""
d.pResourcePolicyMap[resources.LSCC_GETINSTALLEDCHAINCODES] = ""
d.pResourcePolicyMap[resources.Lscc_Install] = ""
d.pResourcePolicyMap[resources.Lscc_GetInstantiatedChaincodes] = ""
d.pResourcePolicyMap[resources.Lscc_GetInstalledChaincodes] = ""

//c resources
d.cResourcePolicyMap[resources.LSCC_DEPLOY] = "" //ACL check covered by PROPOSAL
d.cResourcePolicyMap[resources.LSCC_UPGRADE] = "" //ACL check covered by PROPOSAL
d.cResourcePolicyMap[resources.LSCC_GETCCINFO] = CHANNELREADERS
d.cResourcePolicyMap[resources.LSCC_GETDEPSPEC] = CHANNELREADERS
d.cResourcePolicyMap[resources.LSCC_GETCCDATA] = CHANNELREADERS
d.cResourcePolicyMap[resources.Lscc_Deploy] = "" //ACL check covered by PROPOSAL
d.cResourcePolicyMap[resources.Lscc_Upgrade] = "" //ACL check covered by PROPOSAL
d.cResourcePolicyMap[resources.Lscc_ChaincodeExists] = CHANNELREADERS
d.cResourcePolicyMap[resources.Lscc_GetDeploymentSpec] = CHANNELREADERS
d.cResourcePolicyMap[resources.Lscc_GetChaincodeData] = CHANNELREADERS

//-------------- QSCC --------------
//p resources (none)

//c resources
d.cResourcePolicyMap[resources.QSCC_GetChainInfo] = CHANNELREADERS
d.cResourcePolicyMap[resources.QSCC_GetBlockByNumber] = CHANNELREADERS
d.cResourcePolicyMap[resources.QSCC_GetBlockByHash] = CHANNELREADERS
d.cResourcePolicyMap[resources.QSCC_GetTransactionByID] = CHANNELREADERS
d.cResourcePolicyMap[resources.QSCC_GetBlockByTxID] = CHANNELREADERS
d.cResourcePolicyMap[resources.Qscc_GetChainInfo] = CHANNELREADERS
d.cResourcePolicyMap[resources.Qscc_GetBlockByNumber] = CHANNELREADERS
d.cResourcePolicyMap[resources.Qscc_GetBlockByHash] = CHANNELREADERS
d.cResourcePolicyMap[resources.Qscc_GetTransactionByID] = CHANNELREADERS
d.cResourcePolicyMap[resources.Qscc_GetBlockByTxID] = CHANNELREADERS

//--------------- CSCC resources -----------
//p resources (implemented by the chaincode currently)
d.pResourcePolicyMap[resources.CSCC_JoinChain] = ""
d.pResourcePolicyMap[resources.CSCC_GetChannels] = ""
d.pResourcePolicyMap[resources.Cscc_JoinChain] = ""
d.pResourcePolicyMap[resources.Cscc_GetChannels] = ""

//c resources
d.cResourcePolicyMap[resources.CSCC_GetConfigBlock] = CHANNELREADERS
d.cResourcePolicyMap[resources.CSCC_GetConfigTree] = CHANNELREADERS
d.cResourcePolicyMap[resources.CSCC_SimulateConfigTreeUpdate] = CHANNELWRITERS
d.cResourcePolicyMap[resources.Cscc_GetConfigBlock] = CHANNELREADERS
d.cResourcePolicyMap[resources.Cscc_GetConfigTree] = CHANNELREADERS
d.cResourcePolicyMap[resources.Cscc_SimulateConfigTreeUpdate] = CHANNELWRITERS

//---------------- non-scc resources ------------
//Propose
d.cResourcePolicyMap[resources.PROPOSE] = CHANNELWRITERS
//Peer resources
d.cResourcePolicyMap[resources.Peer_Propose] = CHANNELWRITERS
d.cResourcePolicyMap[resources.Peer_ChaincodeToChaincode] = CHANNELWRITERS

//Chaincode-to-Chaincode
d.cResourcePolicyMap[resources.CC2CC] = CHANNELWRITERS

//Events (not used currently - for future)
d.cResourcePolicyMap[resources.BLOCKEVENT] = CHANNELREADERS
d.cResourcePolicyMap[resources.FILTEREDBLOCKEVENT] = CHANNELREADERS
//Event resources
d.cResourcePolicyMap[resources.Event_Block] = CHANNELREADERS
d.cResourcePolicyMap[resources.Event_FilteredBlock] = CHANNELREADERS
}

//this should cover an exhaustive list of everything called from the peer
Expand Down
61 changes: 30 additions & 31 deletions core/aclmgmt/resources/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,39 @@ SPDX-License-Identifier: Apache-2.0
package resources

//fabric resources used for ACL checks. Note that some of the checks
//such as LSCC_INSTALL are "peer wide" (current access checks in peer are
//such as Lscc_INSTALL are "peer wide" (current access checks in peer are
//based on local MSP). These are not currently covered by resource or default
//ACLProviders
const (
PROPOSE = "PROPOSE"

//LSCC resources
LSCC_INSTALL = "LSCC.INSTALL"
LSCC_DEPLOY = "LSCC.DEPLOY"
LSCC_UPGRADE = "LSCC.UPGRADE"
LSCC_GETCCINFO = "LSCC.GETCCINFO"
LSCC_GETDEPSPEC = "LSCC.GETDEPSPEC"
LSCC_GETCCDATA = "LSCC.GETCCDATA"
LSCC_GETCHAINCODES = "LSCC.GETCHAINCODES"
LSCC_GETINSTALLEDCHAINCODES = "LSCC.GETINSTALLEDCHAINCODES"

//QSCC resources
QSCC_GetChainInfo = "QSCC.GetChainInfo"
QSCC_GetBlockByNumber = "QSCC.GetBlockByNumber"
QSCC_GetBlockByHash = "QSCC.GetBlockByHash"
QSCC_GetTransactionByID = "QSCC.GetTransactionByID"
QSCC_GetBlockByTxID = "QSCC.GetBlockByTxID"

//CSCC resources
CSCC_JoinChain = "CSCC.JoinChain"
CSCC_GetConfigBlock = "CSCC.GetConfigBlock"
CSCC_GetChannels = "CSCC.GetChannels"
CSCC_GetConfigTree = "CSCC.GetConfigTree"
CSCC_SimulateConfigTreeUpdate = "CSCC.SimulateConfigTreeUpdate"

//Chaincode-to-Chaincode call
CC2CC = "CC2CC"
//Lscc resources
Lscc_Install = "lscc.Install"
Lscc_Deploy = "lscc.Deploy"
Lscc_Upgrade = "lscc.Upgrade"
Lscc_ChaincodeExists = "lscc.ChaincodeExists"
Lscc_GetDeploymentSpec = "lscc.GetDeploymentSpec"
Lscc_GetChaincodeData = "lscc.GetChaincodeData"
Lscc_GetInstantiatedChaincodes = "lscc.GetInstantiatedChaincodes"
Lscc_GetInstalledChaincodes = "lscc.GetInstalledChaincodes"

//Qscc resources
Qscc_GetChainInfo = "qscc.GetChainInfo"
Qscc_GetBlockByNumber = "qscc.GetBlockByNumber"
Qscc_GetBlockByHash = "qscc.GetBlockByHash"
Qscc_GetTransactionByID = "qscc.GetTransactionByID"
Qscc_GetBlockByTxID = "qscc.GetBlockByTxID"

//Cscc resources
Cscc_JoinChain = "cscc.JoinChain"
Cscc_GetConfigBlock = "cscc.GetConfigBlock"
Cscc_GetChannels = "cscc.GetChannels"
Cscc_GetConfigTree = "cscc.GetConfigTree"
Cscc_SimulateConfigTreeUpdate = "cscc.SimulateConfigTreeUpdate"

//Peer resources
Peer_Propose = "peer.Propose"
Peer_ChaincodeToChaincode = "peer.ChaincodeToChaincode"

//Events
BLOCKEVENT = "BLOCKEVENT"
FILTEREDBLOCKEVENT = "FILTEREDBLOCKEVENT"
Event_Block = "event.Block"
Event_FilteredBlock = "event.FilteredBlock"
)
90 changes: 45 additions & 45 deletions core/chaincode/chaincode_support_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,9 @@ func initializeCC(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCC

//setup CheckACL calls
mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

//bad txid in response (should be "1"), should fail
resp := &mockpeer.MockResponse{&pb.ChaincodeMessage{Type: pb.ChaincodeMessage_TRANSACTION}, &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_COMPLETED, Payload: putils.MarshalOrPanic(&pb.Response{Status: shim.OK, Payload: []byte("init succeeded")}), Txid: "unknowntxid", ChannelId: chainID}}
Expand Down Expand Up @@ -449,9 +449,9 @@ func invokeCC(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCComm)

//setup CheckACL calls
mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

respSet := &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{
{&pb.ChaincodeMessage{Type: pb.ChaincodeMessage_TRANSACTION}, &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_GET_STATE, Payload: putils.MarshalOrPanic(&pb.GetState{Collection: "", Key: "A"}), Txid: txid, ChannelId: chainID}},
Expand Down Expand Up @@ -550,9 +550,9 @@ func getQueryStateByRange(t *testing.T, collection, chainID, ccname string, ccSi

//setup CheckACL calls
mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

//create the response
queryStateNextFunc := func(reqMsg *pb.ChaincodeMessage) *pb.ChaincodeMessage {
Expand Down Expand Up @@ -617,10 +617,10 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock

//setup CheckACL calls
mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

cccid := ccprovider.NewCCContext(chainID, calledCC, "0", txid, false, sprop, prop)

Expand All @@ -638,13 +638,13 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock

//we want hooks for both chaincodes
mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

sysCCVers := util.GetSysCCVersion()
//call a callable system CC, a regular cc, a regular but different cc on a different chain, a regular but same cc on a different chain, and an uncallable system cc and expect an error inthe last one
Expand Down Expand Up @@ -672,13 +672,13 @@ func cc2cc(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.Mock
ctxt, txsim, sprop, prop = startTx(t, chainID, cis, txid)

mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(errors.New("Bad ACL calling CC"))
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(errors.New("Bad ACL calling CC"))
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)
//call regular cc but without ACL on called CC
respSet = &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{
{&pb.ChaincodeMessage{Type: pb.ChaincodeMessage_RESPONSE}, &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_INVOKE_CHAINCODE, Payload: putils.MarshalOrPanic(&pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "calledCC:0/" + chainID}, Input: &pb.ChaincodeInput{Args: [][]byte{{}}}}), Txid: txid, ChannelId: chainID}}}}
Expand Down Expand Up @@ -711,9 +711,9 @@ func getQueryResult(t *testing.T, collection, chainID, ccname string, ccSide *mo
ctxt, txsim, sprop, prop := startTx(t, chainID, cis, txid)

mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

kvs := make([]*plgr.KV, 1000)
for i := 0; i < 1000; i++ {
Expand Down Expand Up @@ -779,9 +779,9 @@ func getHistory(t *testing.T, chainID, ccname string, ccSide *mockpeer.MockCCCom
ctxt, txsim, sprop, prop := startTx(t, chainID, cis, txid)

mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

kvs := make([]*plgr.KV, 1000)
for i := 0; i < 1000; i++ {
Expand Down Expand Up @@ -1076,10 +1076,10 @@ func cc2SameCC(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.

//setup CheckACL calls
mockAclProvider.Reset()
mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID2, sprop).Return(nil)

cccid := ccprovider.NewCCContext(chainID2, ccname, "0", txid, false, sprop, prop)

Expand All @@ -1101,15 +1101,15 @@ func cc2SameCC(t *testing.T, chainID, chainID2, ccname string, ccSide *mockpeer.
txid = util.GenerateUUID()
ctxt, txsim, sprop, prop = startTx(t, chainID, cis, txid)

mockAclProvider.On("CheckACL", resources.CC2CC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID, sprop).Return(nil)

mockAclProvider.On("CheckACL", resources.CC2CC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETDEPSPEC, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.LSCC_GETCCDATA, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.PROPOSE, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_ChaincodeToChaincode, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetDeploymentSpec, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Lscc_GetChaincodeData, chainID2, sprop).Return(nil)
mockAclProvider.On("CheckACL", resources.Peer_Propose, chainID2, sprop).Return(nil)

txid = "cctosamecctx"
respSet := &mockpeer.MockResponseSet{errorFunc, nil, []*mockpeer.MockResponse{
Expand Down
2 changes: 1 addition & 1 deletion core/chaincode/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ func (handler *Handler) checkACL(signedProp *pb.SignedProposal, proposal *pb.Pro
return errors.Errorf("signed proposal must not be nil from caller [%s]", ccIns.String())
}

return aclmgmt.GetACLProvider().CheckACL(resources.CC2CC, ccIns.ChainID, signedProp)
return aclmgmt.GetACLProvider().CheckACL(resources.Peer_ChaincodeToChaincode, ccIns.ChainID, signedProp)
}

func (handler *Handler) deregister() error {
Expand Down
Loading

0 comments on commit 38e3bc1

Please sign in to comment.