Merge pull request #44413 from thaJeztah/20.10_backport_oci_artifacts_error
[20.10 backport] distribution: Error when pulling OCI artifacts
This commit is contained in:
commit
5ea9cf68ae
|
@ -87,6 +87,19 @@ func (e notFoundError) Cause() error {
|
||||||
return e.cause
|
return e.cause
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// unsupportedMediaTypeError is an error issued when attempted
|
||||||
|
// to pull unsupported content.
|
||||||
|
type unsupportedMediaTypeError struct {
|
||||||
|
MediaType string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e unsupportedMediaTypeError) InvalidParameter() {}
|
||||||
|
|
||||||
|
// Error returns the error string for unsupportedMediaTypeError.
|
||||||
|
func (e unsupportedMediaTypeError) Error() string {
|
||||||
|
return "unsupported media type " + e.MediaType
|
||||||
|
}
|
||||||
|
|
||||||
// TranslatePullError is used to convert an error from a registry pull
|
// TranslatePullError is used to convert an error from a registry pull
|
||||||
// operation to an error representing the entire pull operation. Any error
|
// operation to an error representing the entire pull operation. Any error
|
||||||
// information which is not used by the returned error gets output to
|
// information which is not used by the returned error gets output to
|
||||||
|
@ -150,6 +163,8 @@ func continueOnError(err error, mirrorEndpoint bool) bool {
|
||||||
// Failures from a mirror endpoint should result in fallback to the
|
// Failures from a mirror endpoint should result in fallback to the
|
||||||
// canonical repo.
|
// canonical repo.
|
||||||
return mirrorEndpoint
|
return mirrorEndpoint
|
||||||
|
case unsupportedMediaTypeError:
|
||||||
|
return false
|
||||||
case error:
|
case error:
|
||||||
return !strings.Contains(err.Error(), strings.ToLower(syscall.ESRCH.Error()))
|
return !strings.Contains(err.Error(), strings.ToLower(syscall.ESRCH.Error()))
|
||||||
}
|
}
|
||||||
|
@ -179,7 +194,7 @@ func retryOnError(err error) error {
|
||||||
return xfer.DoNotRetry{Err: v.Err}
|
return xfer.DoNotRetry{Err: v.Err}
|
||||||
}
|
}
|
||||||
return retryOnError(v.Err)
|
return retryOnError(v.Err)
|
||||||
case *client.UnexpectedHTTPResponseError:
|
case *client.UnexpectedHTTPResponseError, unsupportedMediaTypeError:
|
||||||
return xfer.DoNotRetry{Err: err}
|
return xfer.DoNotRetry{Err: err}
|
||||||
case error:
|
case error:
|
||||||
if err == distribution.ErrBlobUnknown {
|
if err == distribution.ErrBlobUnknown {
|
||||||
|
|
|
@ -619,6 +619,21 @@ func (p *v2Puller) pullSchema1(ctx context.Context, ref reference.Reference, unv
|
||||||
return imageID, manifestDigest, nil
|
return imageID, manifestDigest, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkSupportedMediaType(mediaType string) error {
|
||||||
|
supportedMediaTypes := []string{
|
||||||
|
"application/vnd.oci.image.",
|
||||||
|
"application/vnd.docker.",
|
||||||
|
}
|
||||||
|
|
||||||
|
lowerMt := strings.ToLower(mediaType)
|
||||||
|
for _, mt := range supportedMediaTypes {
|
||||||
|
if strings.HasPrefix(lowerMt, mt) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return unsupportedMediaTypeError{MediaType: mediaType}
|
||||||
|
}
|
||||||
|
|
||||||
func (p *v2Puller) pullSchema2Layers(ctx context.Context, target distribution.Descriptor, layers []distribution.Descriptor, platform *specs.Platform) (id digest.Digest, err error) {
|
func (p *v2Puller) pullSchema2Layers(ctx context.Context, target distribution.Descriptor, layers []distribution.Descriptor, platform *specs.Platform) (id digest.Digest, err error) {
|
||||||
if _, err := p.config.ImageStore.Get(ctx, target.Digest); err == nil {
|
if _, err := p.config.ImageStore.Get(ctx, target.Digest); err == nil {
|
||||||
// If the image already exists locally, no need to pull
|
// If the image already exists locally, no need to pull
|
||||||
|
@ -626,6 +641,10 @@ func (p *v2Puller) pullSchema2Layers(ctx context.Context, target distribution.De
|
||||||
return target.Digest, nil
|
return target.Digest, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := checkSupportedMediaType(target.MediaType); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
var descriptors []xfer.DownloadDescriptor
|
var descriptors []xfer.DownloadDescriptor
|
||||||
|
|
||||||
// Note that the order of this loop is in the direction of bottom-most
|
// Note that the order of this loop is in the direction of bottom-most
|
||||||
|
@ -634,6 +653,9 @@ func (p *v2Puller) pullSchema2Layers(ctx context.Context, target distribution.De
|
||||||
if err := d.Digest.Validate(); err != nil {
|
if err := d.Digest.Validate(); err != nil {
|
||||||
return "", errors.Wrapf(err, "could not validate layer digest %q", d.Digest)
|
return "", errors.Wrapf(err, "could not validate layer digest %q", d.Digest)
|
||||||
}
|
}
|
||||||
|
if err := checkSupportedMediaType(d.MediaType); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
layerDescriptor := &v2LayerDescriptor{
|
layerDescriptor := &v2LayerDescriptor{
|
||||||
digest: d.Digest,
|
digest: d.Digest,
|
||||||
repo: p.repo,
|
repo: p.repo,
|
||||||
|
|
Loading…
Reference in New Issue