@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414limitations under the License.
1515*/
1616
17- package peer
17+ package validation
1818
1919import (
2020 "fmt"
@@ -192,8 +192,6 @@ func validateChainHeader(cHdr *common.ChainHeader) error {
192192
193193 // TODO: validate epoch in cHdr.Epoch
194194
195- // TODO: validate type in cHdr.Type
196-
197195 // TODO: validate version in cHdr.Version
198196
199197 return nil
@@ -218,125 +216,150 @@ func validateCommonHeader(hdr *common.Header) error {
218216 return nil
219217}
220218
219+ // validateConfigTransaction validates the payload of a
220+ // transaction assuming its type is CONFIGURATION_TRANSACTION
221+ func validateConfigTransaction (data []byte , hdr * common.Header ) error {
222+ putilsLogger .Infof ("validateConfigTransaction starts for data %p, header %s" , data , hdr )
223+
224+ // check for nil argument
225+ if data == nil || hdr == nil {
226+ return fmt .Errorf ("Nil arguments" )
227+ }
228+
229+ // if the type is CONFIGURATION_TRANSACTION we unmarshal a ConfigurationEnvelope message
230+ ce , err := utils .GetConfigurationEnvelope (data )
231+ if err != nil {
232+ return fmt .Errorf ("GetConfigurationEnvelope failed, err %s" , err )
233+ }
234+
235+ // check that we have at least one configuration item
236+ if ce .Items == nil || len (ce .Items ) == 0 {
237+ return fmt .Errorf ("At least one configuration item is necessary" )
238+ }
239+
240+ for _ , item := range ce .Items {
241+ if item .ConfigurationItem == nil {
242+ return fmt .Errorf ("ConfigurationItem cannot be nil" )
243+ }
244+ }
245+
246+ return nil
247+ }
248+
221249// validateEndorserTransaction validates the payload of a
222250// transaction assuming its type is ENDORSER_TRANSACTION
223- func validateEndorserTransaction (data []byte , hdr * common.Header ) ([] * pb. TransactionAction , error ) {
251+ func validateEndorserTransaction (data []byte , hdr * common.Header ) error {
224252 putilsLogger .Infof ("validateEndorserTransaction starts for data %p, header %s" , data , hdr )
225253
226254 // check for nil argument
227255 if data == nil || hdr == nil {
228- return nil , fmt .Errorf ("Nil arguments" )
256+ return fmt .Errorf ("Nil arguments" )
229257 }
230258
231259 // if the type is ENDORSER_TRANSACTION we unmarshal a Transaction message
232260 tx , err := utils .GetTransaction (data )
233261 if err != nil {
234- return nil , err
262+ return err
235263 }
236264
237265 // check for nil argument
238266 if tx == nil {
239- return nil , fmt .Errorf ("Nil transaction" )
267+ return fmt .Errorf ("Nil transaction" )
240268 }
241269
242270 // TODO: validate tx.Version
243271
244272 // TODO: validate ChaincodeHeaderExtension
245273
246274 if len (tx .Actions ) == 0 {
247- return nil , fmt .Errorf ("At least one TransactionAction is required" )
275+ return fmt .Errorf ("At least one TransactionAction is required" )
248276 }
249277
250278 putilsLogger .Infof ("validateEndorserTransaction info: there are %d actions" , len (tx .Actions ))
251279
252280 for _ , act := range tx .Actions {
253281 // check for nil argument
254282 if act == nil {
255- return nil , fmt .Errorf ("Nil action" )
283+ return fmt .Errorf ("Nil action" )
256284 }
257285
258286 // if the type is ENDORSER_TRANSACTION we unmarshal a SignatureHeader
259287 sHdr , err := utils .GetSignatureHeader (act .Header )
260288 if err != nil {
261- return nil , err
289+ return err
262290 }
263291
264292 // validate the SignatureHeader - here we actually only
265293 // care about the nonce since the creator is in the outer header
266294 err = validateSignatureHeader (sHdr )
267295 if err != nil {
268- return nil , err
296+ return err
269297 }
270298
271299 putilsLogger .Infof ("validateEndorserTransaction info: signature header is valid" )
272300
273301 // if the type is ENDORSER_TRANSACTION we unmarshal a ChaincodeActionPayload
274302 cap , err := utils .GetChaincodeActionPayload (act .Payload )
275303 if err != nil {
276- return nil , err
304+ return err
277305 }
278306
279307 // extract the proposal response payload
280308 prp , err := utils .GetProposalResponsePayload (cap .Action .ProposalResponsePayload )
281309 if err != nil {
282- return nil , err
310+ return err
283311 }
284312
285313 // build the original header by stitching together
286314 // the common ChainHeader and the per-action SignatureHeader
287315 hdrOrig := & common.Header {ChainHeader : hdr .ChainHeader , SignatureHeader : sHdr }
288316 hdrBytes , err := utils .GetBytesHeader (hdrOrig ) // FIXME: here we hope that hdrBytes will be the same one that the endorser had
289317 if err != nil {
290- return nil , err
318+ return err
291319 }
292320
293321 // compute proposalHash
294322 pHash , err := utils .GetProposalHash2 (hdrBytes , cap .ChaincodeProposalPayload )
295323 if err != nil {
296- return nil , err
324+ return err
297325 }
298326
299327 // ensure that the proposal hash matches
300328 if bytes .Compare (pHash , prp .ProposalHash ) != 0 {
301- return nil , fmt .Errorf ("proposal hash does not match" )
329+ return fmt .Errorf ("proposal hash does not match" )
302330 }
303331 }
304332
305- return tx . Actions , nil
333+ return nil
306334}
307335
308336// ValidateTransaction checks that the transaction envelope is properly formed
309- func ValidateTransaction (e * common.Envelope ) (* common.Payload , [] * pb. TransactionAction , error ) {
337+ func ValidateTransaction (e * common.Envelope ) (* common.Payload , error ) {
310338 putilsLogger .Infof ("ValidateTransactionEnvelope starts for envelope %p" , e )
311339
312340 // check for nil argument
313341 if e == nil {
314- return nil , nil , fmt .Errorf ("Nil Envelope" )
342+ return nil , fmt .Errorf ("Nil Envelope" )
315343 }
316344
317345 // get the payload from the envelope
318346 payload , err := utils .GetPayload (e )
319347 if err != nil {
320- return nil , nil , fmt .Errorf ("Could not extract payload from envelope, err %s" , err )
348+ return nil , fmt .Errorf ("Could not extract payload from envelope, err %s" , err )
321349 }
322350
323351 putilsLogger .Infof ("Header is %s" , payload .Header )
324352
325- if common .HeaderType (payload .Header .ChainHeader .Type ) == common .HeaderType_CONFIGURATION_TRANSACTION {
326- putilsLogger .Warningf ("Skipping common.HeaderType_CONFIGURATION_TRANSACTION validation pending JIRA-1639\n " )
327- return payload , nil , nil
328- }
329-
330353 // validate the header
331354 err = validateCommonHeader (payload .Header )
332355 if err != nil {
333- return nil , nil , err
356+ return nil , err
334357 }
335358
336359 // validate the signature in the envelope
337360 err = checkSignatureFromCreator (payload .Header .SignatureHeader .Creator , e .Signature , e .Payload , payload .Header .ChainHeader .ChainID )
338361 if err != nil {
339- return nil , nil , err
362+ return nil , err
340363 }
341364
342365 // TODO: ensure that creator can transact with us (some ACLs?) which set of APIs is supposed to give us this info?
@@ -346,10 +369,14 @@ func ValidateTransaction(e *common.Envelope) (*common.Payload, []*pb.Transaction
346369 // continue the validation in a way that depends on the type specified in the header
347370 switch common .HeaderType (payload .Header .ChainHeader .Type ) {
348371 case common .HeaderType_ENDORSER_TRANSACTION :
349- rv , err := validateEndorserTransaction (payload .Data , payload .Header )
350- putilsLogger .Infof ("ValidateTransactionEnvelope returns %p, err %s" , rv , err )
351- return payload , rv , err
372+ err = validateEndorserTransaction (payload .Data , payload .Header )
373+ putilsLogger .Infof ("ValidateTransactionEnvelope returns err %s" , err )
374+ return payload , err
375+ case common .HeaderType_CONFIGURATION_TRANSACTION :
376+ err = validateConfigTransaction (payload .Data , payload .Header )
377+ putilsLogger .Infof ("ValidateTransactionEnvelope returns err %s" , err )
378+ return payload , err
352379 default :
353- return nil , nil , fmt .Errorf ("Unsupported transaction payload type %d" , common .HeaderType (payload .Header .ChainHeader .Type ))
380+ return nil , fmt .Errorf ("Unsupported transaction payload type %d" , common .HeaderType (payload .Header .ChainHeader .Type ))
354381 }
355382}
0 commit comments