schema1: reject ambiguous documents

Signed-off-by: Samuel Karp <skarp@amazon.com>
containerd · Nov 15, 2021 · 70c88f5 · 70c88f5
1 parent eb9ba7e
commit 70c88f5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go
@@ -255,6 +255,9 @@ func (c *Converter) fetchManifest(ctx context.Context, desc ocispec.Descriptor)
 	if err := json.Unmarshal(b, &m); err != nil {
 		return err
 	}
+	if len(m.Manifests) != 0 || len(m.Layers) != 0 {
+		return errors.New("converter: expected schema1 document but found extra keys")
+	}
 	c.pulledManifest = &m
 
 	return nil
@@ -471,8 +474,10 @@ type history struct {
 }
 
 type manifest struct {
-	FSLayers []fsLayer `json:"fsLayers"`
-	History  []history `json:"history"`
+	FSLayers  []fsLayer       `json:"fsLayers"`
+	History   []history       `json:"history"`
+	Layers    json.RawMessage `json:"layers,omitempty"`    // OCI manifest
+	Manifests json.RawMessage `json:"manifests,omitempty"` // OCI index
 }
 
 type v1History struct {