fix optional field in cose schema

Signed-off-by: Bob Callaway <bcallaway@google.com>
sigstore · Nov 23, 2023 · ff9c3b9 · ff9c3b9
1 parent 0dccf0f
commit ff9c3b9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/pkg/generated/models/cose_v001_schema.go b/pkg/generated/models/cose_v001_schema.go
diff --git a/pkg/generated/restapi/embedded_spec.go b/pkg/generated/restapi/embedded_spec.go
diff --git a/pkg/types/cose/v0.0.1/cose_v0_0_1_schema.json b/pkg/types/cose/v0.0.1/cose_v0_0_1_schema.json
@@ -75,7 +75,6 @@
         }
     },
     "required": [
-        "publicKey",
-        "data"
+        "publicKey"
     ]
 }
diff --git a/pkg/types/cose/v0.0.1/entry.go b/pkg/types/cose/v0.0.1/entry.go
@@ -171,10 +171,13 @@ func (v *V001Entry) Unmarshal(pe models.ProposedEntry) error {
 	// Store the envelope hash.
 	// The CoseObj.Message is only populated during entry creation.
 	// When marshalling from the database (retrieval) the envelope
-	// hash must be decoded fromt he stored hex string.
+	// hash must be decoded from the stored hex string.
 	// The envelope hash is used to create the attestation key during
 	// retrieval of a record.
 	if len(v.CoseObj.Message) == 0 {
+		if v.CoseObj.Data == nil || v.CoseObj.Data.EnvelopeHash == nil || v.CoseObj.Data.EnvelopeHash.Value == nil {
+			return errors.New("envelope hash should have been previously computed")
+		}
 		b, err := hex.DecodeString(*v.CoseObj.Data.EnvelopeHash.Value)
 		if err != nil {
 			return err