schema1: reject ambiguous documents

samuelkarp · samuelkarp · commit 70c88f507579 · 2021-11-15T12:00:42.000-08:00
Signed-off-by: Samuel Karp &lt;skarp@amazon.com&gt;
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 {

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,9 @@ func (c *Converter) fetchManifest(ctx context.Context, desc ocispec.Descriptor)`
`255`	`255`	`if err := json.Unmarshal(b, &m); err != nil {`
`256`	`256`	`return err`
`257`	`257`	`}`
	`258`	`+ if len(m.Manifests) != 0 \|\| len(m.Layers) != 0 {`
	`259`	`+ return errors.New("converter: expected schema1 document but found extra keys")`
	`260`	`+ }`
`258`	`261`	`c.pulledManifest = &m`
`259`	`262`
`260`	`263`	`return nil`
`@@ -471,8 +474,10 @@ type history struct {`
`471`	`474`	`}`
`472`	`475`
`473`	`476`	`type manifest struct {`
`474`		- FSLayers []fsLayer `json:"fsLayers"`
`475`		- History []history `json:"history"`
	`477`	+ FSLayers []fsLayer `json:"fsLayers"`
	`478`	+ History []history `json:"history"`
	`479`	+ Layers json.RawMessage `json:"layers,omitempty"` // OCI manifest
	`480`	+ Manifests json.RawMessage `json:"manifests,omitempty"` // OCI index
`476`	`481`	`}`
`477`	`482`
`478`	`483`	`type v1History struct {`