schema1: reject ambiguous documents

samuelkarp · samuelkarp · commit 15d8c03e3260 · 2021-11-15T13:31:47.000-08:00
Signed-off-by: Samuel Karp <skarp@amazon.com> (cherry picked from commit 70c88f5) Signed-off-by: Samuel Karp <skarp@amazon.com>
diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go
@@ -256,6 +256,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
@@ -472,8 +475,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
`@@ -256,6 +256,9 @@ func (c *Converter) fetchManifest(ctx context.Context, desc ocispec.Descriptor)`
`256`	`256`	`if err := json.Unmarshal(b, &m); err != nil {`
`257`	`257`	`return err`
`258`	`258`	`}`
	`259`	`+ if len(m.Manifests) != 0 \|\| len(m.Layers) != 0 {`
	`260`	`+ return errors.New("converter: expected schema1 document but found extra keys")`
	`261`	`+ }`
`259`	`262`	`c.pulledManifest = &m`
`260`	`263`
`261`	`264`	`return nil`
`@@ -472,8 +475,10 @@ type history struct {`
`472`	`475`	`}`
`473`	`476`
`474`	`477`	`type manifest struct {`
`475`		- FSLayers []fsLayer `json:"fsLayers"`
`476`		- History []history `json:"history"`
	`478`	+ FSLayers []fsLayer `json:"fsLayers"`
	`479`	+ History []history `json:"history"`
	`480`	+ Layers json.RawMessage `json:"layers,omitempty"` // OCI manifest
	`481`	+ Manifests json.RawMessage `json:"manifests,omitempty"` // OCI index
`477`	`482`	`}`
`478`	`483`
`479`	`484`	`type v1History struct {`