Merge pull request #3696 from dmcgowan/fix-all-media-types

dmcgowan · web-flow · commit a668365eca1d · 2019-09-26T16:27:33.000-07:00
Fix all media types in Accept header to match RFC
diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go
@@ -136,7 +136,7 @@ func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.R
 }
 
 func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string, offset int64) (io.ReadCloser, error) {
-	req.header.Set("Accept", strings.Join([]string{mediatype, `*`}, ", "))
+	req.header.Set("Accept", strings.Join([]string{mediatype, `*/*`}, ", "))
 
 	if offset > 0 {
 		// Note: "Accept-Ranges: bytes" cannot be trusted as some endpoints
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -80,7 +80,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
 	}
 
 	req := p.request(host, http.MethodHead, existCheck...)
-	req.header.Set("Accept", strings.Join([]string{desc.MediaType, `*`}, ", "))
+	req.header.Set("Accept", strings.Join([]string{desc.MediaType, `*/*`}, ", "))
 
 	log.G(ctx).WithField("url", req.String()).Debugf("checking and pushing to")
 
diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
@@ -155,7 +155,7 @@ func NewResolver(options ResolverOptions) remotes.Resolver {
 			images.MediaTypeDockerSchema2Manifest,
 			images.MediaTypeDockerSchema2ManifestList,
 			ocispec.MediaTypeImageManifest,
-			ocispec.MediaTypeImageIndex, "*"}, ", "))
+			ocispec.MediaTypeImageIndex, "*/*"}, ", "))
 	} else {
 		resolveHeader["Accept"] = options.Headers["Accept"]
 		delete(options.Headers, "Accept")

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.R`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string, offset int64) (io.ReadCloser, error) {`
`139`		- req.header.Set("Accept", strings.Join([]string{mediatype, `*`}, ", "))
	`139`	+ req.header.Set("Accept", strings.Join([]string{mediatype, `/`}, ", "))
`140`	`140`
`141`	`141`	`if offset > 0 {`
`142`	`142`	`// Note: "Accept-Ranges: bytes" cannot be trusted as some endpoints`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`req := p.request(host, http.MethodHead, existCheck...)`
`83`		- req.header.Set("Accept", strings.Join([]string{desc.MediaType, `*`}, ", "))
	`83`	+ req.header.Set("Accept", strings.Join([]string{desc.MediaType, `/`}, ", "))
`84`	`84`
`85`	`85`	`log.G(ctx).WithField("url", req.String()).Debugf("checking and pushing to")`
`86`	`86`