updated COSE expiry header check (notaryproject#42)

* updated COSE envelope implementation per code reivew Signed-off-by: Patrick Zheng <[email protected]> * renamed to envelope under cose package Signed-off-by: Patrick Zheng <[email protected]> * update per code review Signed-off-by: Patrick Zheng <[email protected]> * updated per code review Signed-off-by: Patrick Zheng <[email protected]> * clean up Signed-off-by: Patrick Zheng <[email protected]> * more clean up Signed-off-by: Patrick Zheng <[email protected]> * updated errors according to errors.go Signed-off-by: Patrick Zheng <[email protected]> * clean up Signed-off-by: Patrick Zheng <[email protected]> * update unit tests Signed-off-by: Patrick Zheng <[email protected]> * update unit tests Signed-off-by: Patrick Zheng <[email protected]> * update cose unprotected header Signed-off-by: Patrick Zheng <[email protected]> * updated COSE expiry header check Signed-off-by: Patrick Zheng <[email protected]> * updated COSE expiry header check Signed-off-by: Patrick Zheng <[email protected]> Signed-off-by: Patrick Zheng <[email protected]>
JeyJeyGao · Sep 13, 2022 · 98e1d91 · 98e1d91
1 parent 62cec04
commit 98e1d91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/signature/cose/envelope.go b/signature/cose/envelope.go
@@ -430,11 +430,13 @@ func parseProtectedHeaders(protected cose.ProtectedHeader, signerInfo *signature
 	signerInfo.SignedAttributes.SigningTime = time.Unix(signingTime, 0)
 
 	// populate signerInfo.SignedAttributes.Expiry
-	exp, ok := protected[headerLabelExpiry].(int64)
-	if !ok {
-		return &signature.MalformedSignatureError{Msg: "malformed expiry"}
+	if exp, ok := protected[headerLabelExpiry]; ok {
+		expiry, ok := exp.(int64)
+		if !ok {
+			return &signature.MalformedSignatureError{Msg: "expiry requires int64 type"}
+		}
+		signerInfo.SignedAttributes.Expiry = time.Unix(expiry, 0)
 	}
-	signerInfo.SignedAttributes.Expiry = time.Unix(exp, 0)
 
 	// populate signerInfo.SignedAttributes.ExtendedAttributes
 	signerInfo.SignedAttributes.ExtendedAttributes, err = generateExtendedAttributes(extendedAttributeKeys, protected)

diff --git a/signature/cose/envelope_test.go b/signature/cose/envelope_test.go
@@ -34,7 +34,8 @@ func newSignRequest(signingScheme string) (*signature.SignRequest, error) {
 		Expiry:      time.Now().AddDate(0, 0, 1),
 		ExtendedSignedAttributes: []signature.Attribute{
 			{Key: "signedCritKey1", Value: "signedCritValue1", Critical: true},
-			{Key: "signedKey1", Value: "signedValue1", Critical: false}},
+			{Key: "signedKey1", Value: "signedValue1", Critical: false},
+		},
 		SigningAgent:  "NotationUnitTest/1.0.0",
 		SigningScheme: signature.SigningScheme(signingScheme),
 	}, nil