Merge pull request #71 from aporcupine/patch-1

russellhaering · web-flow · commit fb23e0af61c0 · 2021-08-27T20:19:01.000-07:00
Explicitly check for case where SignatureValue is nil
diff --git a/validate.go b/validate.go
@@ -268,6 +268,9 @@ func (ctx *ValidationContext) validateSignature(el *etree.Element, sig *types.Si
 	if !bytes.Equal(digest, decodedDigestValue) {
 		return nil, errors.New("Signature could not be verified")
 	}
+	if sig.SignatureValue == nil {
+		return nil, errors.New("Signature could not be verified")
+	}
 
 	// Decode the 'SignatureValue' so we can compare against it
 	decodedSignature, err := base64.StdEncoding.DecodeString(sig.SignatureValue.Data)

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,9 @@ func (ctx ValidationContext) validateSignature(el etree.Element, sig *types.Si`
`268`	`268`	`if !bytes.Equal(digest, decodedDigestValue) {`
`269`	`269`	`return nil, errors.New("Signature could not be verified")`
`270`	`270`	`}`
	`271`	`+ if sig.SignatureValue == nil {`
	`272`	`+ return nil, errors.New("Signature could not be verified")`
	`273`	`+ }`
`271`	`274`
`272`	`275`	`// Decode the 'SignatureValue' so we can compare against it`
`273`	`276`	`decodedSignature, err := base64.StdEncoding.DecodeString(sig.SignatureValue.Data)`