TrueCloudLab/distribution
13
0
Fork 3
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #2704 from dmcgowan/fix-2703

Browse source 
Fix registry stripping newlines from manifests
This commit is contained in:
Derek McGowan 2018-09-05 17:46:56 -07:00 committed by GitHub
commit 15de837aa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
registry/storage/manifestlisthandler.go
View file

@ -2,7 +2,6 @@ package storage
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"github.com/docker/distribution" "github.com/docker/distribution"
@ -23,12 +22,12 @@ var _ ManifestHandler = &manifestListHandler{}
func (ms *manifestListHandler) Unmarshal(ctx context.Context, dgst digest.Digest, content []byte) (distribution.Manifest, error) { func (ms *manifestListHandler) Unmarshal(ctx context.Context, dgst digest.Digest, content []byte) (distribution.Manifest, error) {
dcontext.GetLogger(ms.ctx).Debug("(*manifestListHandler).Unmarshal") dcontext.GetLogger(ms.ctx).Debug("(*manifestListHandler).Unmarshal")
var m manifestlist.DeserializedManifestList m := &manifestlist.DeserializedManifestList{}
if err := json.Unmarshal(content, &m); err != nil { if err := m.UnmarshalJSON(content); err != nil {
return nil, err return nil, err
} }
return &m, nil return m, nil
} }
func (ms *manifestListHandler) Put(ctx context.Context, manifestList distribution.Manifest, skipDependencyVerification bool) (digest.Digest, error) { func (ms *manifestListHandler) Put(ctx context.Context, manifestList distribution.Manifest, skipDependencyVerification bool) (digest.Digest, error) {

7
registry/storage/ocimanifesthandler.go
View file

@ -2,7 +2,6 @@ package storage
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"net/url" "net/url"
@ -26,12 +25,12 @@ var _ ManifestHandler = &ocischemaManifestHandler{}
func (ms *ocischemaManifestHandler) Unmarshal(ctx context.Context, dgst digest.Digest, content []byte) (distribution.Manifest, error) { func (ms *ocischemaManifestHandler) Unmarshal(ctx context.Context, dgst digest.Digest, content []byte) (distribution.Manifest, error) {
dcontext.GetLogger(ms.ctx).Debug("(*ocischemaManifestHandler).Unmarshal") dcontext.GetLogger(ms.ctx).Debug("(*ocischemaManifestHandler).Unmarshal")
var m ocischema.DeserializedManifest m := &ocischema.DeserializedManifest{}
if err := json.Unmarshal(content, &m); err != nil { if err := m.UnmarshalJSON(content); err != nil {
return nil, err return nil, err
} }
return &m, nil return m, nil
} }
func (ms *ocischemaManifestHandler) Put(ctx context.Context, manifest distribution.Manifest, skipDependencyVerification bool) (digest.Digest, error) { func (ms *ocischemaManifestHandler) Put(ctx context.Context, manifest distribution.Manifest, skipDependencyVerification bool) (digest.Digest, error) {

7
registry/storage/schema2manifesthandler.go
View file

@ -2,7 +2,6 @@ package storage
import ( import (
"context" "context"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"net/url" "net/url"
@ -33,12 +32,12 @@ var _ ManifestHandler = &schema2ManifestHandler{}
func (ms *schema2ManifestHandler) Unmarshal(ctx context.Context, dgst digest.Digest, content []byte) (distribution.Manifest, error) { func (ms *schema2ManifestHandler) Unmarshal(ctx context.Context, dgst digest.Digest, content []byte) (distribution.Manifest, error) {
dcontext.GetLogger(ms.ctx).Debug("(*schema2ManifestHandler).Unmarshal") dcontext.GetLogger(ms.ctx).Debug("(*schema2ManifestHandler).Unmarshal")
var m schema2.DeserializedManifest m := &schema2.DeserializedManifest{}
if err := json.Unmarshal(content, &m); err != nil { if err := m.UnmarshalJSON(content); err != nil {
return nil, err return nil, err
} }
return &m, nil return m, nil
} }
func (ms *schema2ManifestHandler) Put(ctx context.Context, manifest distribution.Manifest, skipDependencyVerification bool) (digest.Digest, error) { func (ms *schema2ManifestHandler) Put(ctx context.Context, manifest distribution.Manifest, skipDependencyVerification bool) (digest.Digest, error) {