Fix auth checks for cross-repo mount requests #9593
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| package server | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
|
|
||
| "github.com/docker/distribution" | ||
| "github.com/docker/distribution/context" | ||
| "github.com/docker/distribution/digest" | ||
| "github.com/docker/distribution/registry/storage" | ||
| ) | ||
|
|
||
| // errorBlobStore wraps a distribution.BlobStore for a particular repo. | ||
| // before delegating, it ensures auth completed and there were no errors relevant to the repo. | ||
| type errorBlobStore struct { | ||
| store distribution.BlobStore | ||
| repo *repository | ||
| } | ||
|
|
||
| var _ distribution.BlobStore = &errorBlobStore{} | ||
|
|
||
| func (r *errorBlobStore) Stat(ctx context.Context, dgst digest.Digest) (distribution.Descriptor, error) { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return distribution.Descriptor{}, err | ||
| } | ||
| return r.store.Stat(ctx, dgst) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) Get(ctx context.Context, dgst digest.Digest) ([]byte, error) { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
| return r.store.Get(ctx, dgst) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) Open(ctx context.Context, dgst digest.Digest) (distribution.ReadSeekCloser, error) { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
| return r.store.Open(ctx, dgst) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) Put(ctx context.Context, mediaType string, p []byte) (distribution.Descriptor, error) { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return distribution.Descriptor{}, err | ||
| } | ||
| return r.store.Put(ctx, mediaType, p) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) Create(ctx context.Context, options ...distribution.BlobCreateOption) (distribution.BlobWriter, error) { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| opts, err := effectiveCreateOptions(options) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if err := checkPendingCrossMountErrors(ctx, opts); err != nil { | ||
| context.GetLogger(r.repo.ctx).Debugf("disabling cross-mount because of pending error: %v", err) | ||
| options = append(options, guardCreateOptions{DisableCrossMount: true}) | ||
| } else { | ||
| options = append(options, guardCreateOptions{}) | ||
| } | ||
|
|
||
| return r.store.Create(ctx, options...) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) Resume(ctx context.Context, id string) (distribution.BlobWriter, error) { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
| return r.store.Resume(ctx, id) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) ServeBlob(ctx context.Context, w http.ResponseWriter, req *http.Request, dgst digest.Digest) error { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return err | ||
| } | ||
| return r.store.ServeBlob(ctx, w, req, dgst) | ||
| } | ||
|
|
||
| func (r *errorBlobStore) Delete(ctx context.Context, dgst digest.Digest) error { | ||
| if err := r.repo.checkPendingErrors(ctx); err != nil { | ||
| return err | ||
| } | ||
| return r.store.Delete(ctx, dgst) | ||
| } | ||
|
|
||
| // Find out what the blob creation options are going to do by dry-running them | ||
| func effectiveCreateOptions(options []distribution.BlobCreateOption) (*storage.CreateOptions, error) { | ||
| opts := &storage.CreateOptions{} | ||
| for _, createOptions := range options { | ||
| err := createOptions.Apply(opts) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return opts, nil | ||
| } | ||
|
|
||
| func checkPendingCrossMountErrors(ctx context.Context, opts *storage.CreateOptions) error { | ||
| if !opts.Mount.ShouldMount { | ||
| return nil | ||
| } | ||
| namespace, name, err := getNamespaceName(opts.Mount.From.Name()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return checkPendingErrors(context.GetLogger(ctx), ctx, namespace, name) | ||
| } | ||
|
|
||
| // guardCreateOptions ensures the expected options type is passed, and optionally disables cross mounting | ||
| type guardCreateOptions struct { | ||
| DisableCrossMount bool | ||
| } | ||
|
|
||
| var _ distribution.BlobCreateOption = guardCreateOptions{} | ||
|
|
||
| func (f guardCreateOptions) Apply(v interface{}) error { | ||
| opts, ok := v.(*storage.CreateOptions) | ||
| if !ok { | ||
| return fmt.Errorf("Unexpected create options: %#v", v) | ||
| } | ||
| if f.DisableCrossMount { | ||
| opts.Mount.ShouldMount = false | ||
| } | ||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package server | ||
|
|
||
| import ( | ||
| "github.com/docker/distribution" | ||
| "github.com/docker/distribution/context" | ||
| ) | ||
|
|
||
| // errorTagService wraps a distribution.TagService for a particular repo. | ||
| // before delegating, it ensures auth completed and there were no errors relevant to the repo. | ||
| type errorTagService struct { | ||
| tags distribution.TagService | ||
| repo *repository | ||
| } | ||
|
|
||
| var _ distribution.TagService = &errorTagService{} | ||
|
|
||
| func (t *errorTagService) Get(ctx context.Context, tag string) (distribution.Descriptor, error) { | ||
| if err := t.repo.checkPendingErrors(ctx); err != nil { | ||
| return distribution.Descriptor{}, err | ||
| } | ||
| return t.tags.Get(ctx, tag) | ||
| } | ||
|
|
||
| func (t *errorTagService) Tag(ctx context.Context, tag string, desc distribution.Descriptor) error { | ||
| if err := t.repo.checkPendingErrors(ctx); err != nil { | ||
| return err | ||
| } | ||
| return t.tags.Tag(ctx, tag, desc) | ||
| } | ||
|
|
||
| func (t *errorTagService) Untag(ctx context.Context, tag string) error { | ||
| if err := t.repo.checkPendingErrors(ctx); err != nil { | ||
| return err | ||
| } | ||
| return t.tags.Untag(ctx, tag) | ||
| } | ||
|
|
||
| func (t *errorTagService) All(ctx context.Context) ([]string, error) { | ||
| if err := t.repo.checkPendingErrors(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
| return t.tags.All(ctx) | ||
| } | ||
|
|
||
| func (t *errorTagService) Lookup(ctx context.Context, digest distribution.Descriptor) ([]string, error) { | ||
| if err := t.repo.checkPendingErrors(ctx); err != nil { | ||
| return nil, err | ||
| } | ||
| return t.tags.Lookup(ctx, digest) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather define
(*repository).Name()returningstringand go without helpers.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to make sure we're working with the ns and name