@@ -20,6 +20,7 @@ import (
2020 "errors"
2121 "fmt"
2222
23+ "github.com/hyperledger/fabric/common/cauthdsl"
2324 "github.com/hyperledger/fabric/core/chaincode/shim"
2425 "github.com/hyperledger/fabric/core/peer/msp"
2526 "github.com/hyperledger/fabric/protos/common"
@@ -48,20 +49,26 @@ func (vscc *ValidatorOneValidSignature) Init(stub shim.ChaincodeStubInterface) (
4849// policy specification to be coded as a transaction of the chaincode and the client
4950// selecting which policy to use for validation using parameter function
5051// @return serialized Block of valid and invalid transactions indentified
51- // Note that Peer calls this function with 2 arguments, where args[0] is the
52- // function name and args[1] is the Envelope
52+ // Note that Peer calls this function with 3 arguments, where args[0] is the
53+ // function name, args[1] is the Envelope and args[2] is the validation policy
5354func (vscc * ValidatorOneValidSignature ) Invoke (stub shim.ChaincodeStubInterface ) ([]byte , error ) {
55+ // TODO: document the argument in some white paper or design document
5456 // args[0] - function name (not used now)
5557 // args[1] - serialized Envelope
58+ // args[2] - serialized policy
5659 args := stub .GetArgs ()
57- if len (args ) < 2 {
60+ if len (args ) < 3 {
5861 return nil , errors .New ("Incorrect number of arguments" )
5962 }
6063
6164 if args [1 ] == nil {
6265 return nil , errors .New ("No block to validate" )
6366 }
6467
68+ if args [2 ] == nil {
69+ return nil , errors .New ("No policy supplied" )
70+ }
71+
6572 logger .Infof ("VSCC invoked" )
6673
6774 // get the envelope...
@@ -78,6 +85,15 @@ func (vscc *ValidatorOneValidSignature) Invoke(stub shim.ChaincodeStubInterface)
7885 return nil , err
7986 }
8087
88+ // get the policy
89+ mgr := mspmgmt .GetManagerForChain (payl .Header .ChainHeader .ChainID )
90+ pProvider := cauthdsl .NewPolicyProvider (mgr )
91+ policy , err := pProvider .NewPolicy (args [2 ])
92+ if err != nil {
93+ logger .Errorf ("VSCC error: pProvider.NewPolicy failed, err %s" , err )
94+ return nil , err
95+ }
96+
8197 // validate the payload type
8298 if common .HeaderType (payl .Header .ChainHeader .Type ) != common .HeaderType_ENDORSER_TRANSACTION {
8399 logger .Errorf ("Only Endorser Transactions are supported, provided type %d" , payl .Header .ChainHeader .Type )
@@ -99,29 +115,29 @@ func (vscc *ValidatorOneValidSignature) Invoke(stub shim.ChaincodeStubInterface)
99115 return nil , err
100116 }
101117
102- // this is what is being signed
118+ // this is the first part of the signed message
103119 prespBytes := cap .Action .ProposalResponsePayload
104120
105- // loop through each of the endorsements
106- for _ , endorsement := range cap .Action .Endorsements {
107- // extract the identity of the signer
108- end , err := mspmgmt .GetManagerForChain (payl .Header .ChainHeader .ChainID ).DeserializeIdentity (endorsement .Endorser )
109- if err != nil {
110- logger .Errorf ("VSCC error: DeserializeIdentity failed, err %s" , err )
111- return nil , err
112- }
113-
114- // validate it
115- err = end .Validate ()
116- if err != nil {
117- return nil , fmt .Errorf ("Invalid endorser identity, err %s" , err )
121+ // build the signature set for the evaluation
122+ signatureSet := make ([]* common.SignedData , len (cap .Action .Endorsements ))
123+
124+ // loop through each of the endorsements and build the signature set
125+ for i , endorsement := range cap .Action .Endorsements {
126+ signatureSet [i ] = & common.SignedData {
127+ // set the data that is signed; concatenation of proposal response bytes and endorser ID
128+ Data : append (prespBytes , endorsement .Endorser ... ),
129+ // set the identity that signs the message: it's the endorser
130+ Identity : endorsement .Endorser ,
131+ // set the signature
132+ Signature : endorsement .Signature ,
118133 }
134+ }
119135
120- // verify the signature
121- err = end . Verify ( append ( prespBytes , endorsement . Endorser ... ), endorsement . Signature )
122- if err != nil {
123- return nil , fmt .Errorf ("Invalid signature , err %s" , err )
124- }
136+ // evaluate the signature set against the policy
137+ err = policy . Evaluate ( signatureSet )
138+ if err != nil {
139+ logger .Errorf ("VSCC error: policy evaluation failed , err %s" , err )
140+ return nil , err
125141 }
126142 }
127143
0 commit comments