cb6f002350
Add a generic Manifest interface to represent manifests in the registry and remove references to schema specific manifests. Add a ManifestBuilder to construct Manifest objects. Concrete manifest builders will exist for each manifest type and implementations will contain manifest specific data used to build a manifest. Remove Signatures() from Repository interface. Signatures are relevant only to schema1 manifests. Move access to the signature store inside the schema1 manifestStore. Add some API tests to verify signature roundtripping. schema1 ------- Change the way data is stored in schema1.Manifest to enable Payload() to be used to return complete Manifest JSON from the HTTP handler without knowledge of the schema1 protocol. tags ---- Move tag functionality to a seperate TagService and update ManifestService to use the new interfaces. Implement a driver based tagService to be backward compatible with the current tag service. Add a proxyTagService to enable the registry to get a digest for remote manifests from a tag. manifest store -------------- Remove revision store and move all signing functionality into the signed manifeststore. manifest registration --------------------- Add a mechanism to register manifest media types and to allow different manifest types to be Unmarshalled correctly. client ------ Add ManifestServiceOptions to client functions to allow tags to be passed into Put and Get for building correct registry URLs. Change functional arguments to be an interface type to allow passing data without mutating shared state. Signed-off-by: Richard Scothern <richard.scothern@gmail.com> Signed-off-by: Richard Scothern <richard.scothern@docker.com>
132 lines
3.0 KiB
Go
132 lines
3.0 KiB
Go
package storage
|
|
|
|
import (
|
|
"path"
|
|
"sync"
|
|
|
|
"github.com/docker/distribution/context"
|
|
"github.com/docker/distribution/digest"
|
|
)
|
|
|
|
type signatureStore struct {
|
|
repository *repository
|
|
blobStore *blobStore
|
|
ctx context.Context
|
|
}
|
|
|
|
func (s *signatureStore) Get(dgst digest.Digest) ([][]byte, error) {
|
|
signaturesPath, err := pathFor(manifestSignaturesPathSpec{
|
|
name: s.repository.Name(),
|
|
revision: dgst,
|
|
})
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Need to append signature digest algorithm to path to get all items.
|
|
// Perhaps, this should be in the pathMapper but it feels awkward. This
|
|
// can be eliminated by implementing listAll on drivers.
|
|
signaturesPath = path.Join(signaturesPath, "sha256")
|
|
|
|
signaturePaths, err := s.blobStore.driver.List(s.ctx, signaturesPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var wg sync.WaitGroup
|
|
type result struct {
|
|
index int
|
|
signature []byte
|
|
err error
|
|
}
|
|
ch := make(chan result)
|
|
|
|
bs := s.linkedBlobStore(s.ctx, dgst)
|
|
for i, sigPath := range signaturePaths {
|
|
sigdgst, err := digest.ParseDigest("sha256:" + path.Base(sigPath))
|
|
if err != nil {
|
|
context.GetLogger(s.ctx).Errorf("could not get digest from path: %q, skipping", sigPath)
|
|
continue
|
|
}
|
|
|
|
wg.Add(1)
|
|
go func(idx int, sigdgst digest.Digest) {
|
|
defer wg.Done()
|
|
context.GetLogger(s.ctx).
|
|
Debugf("fetching signature %q", sigdgst)
|
|
|
|
r := result{index: idx}
|
|
|
|
if p, err := bs.Get(s.ctx, sigdgst); err != nil {
|
|
context.GetLogger(s.ctx).
|
|
Errorf("error fetching signature %q: %v", sigdgst, err)
|
|
r.err = err
|
|
} else {
|
|
r.signature = p
|
|
}
|
|
|
|
ch <- r
|
|
}(i, sigdgst)
|
|
}
|
|
done := make(chan struct{})
|
|
go func() {
|
|
wg.Wait()
|
|
close(done)
|
|
}()
|
|
|
|
// aggregrate the results
|
|
signatures := make([][]byte, len(signaturePaths))
|
|
loop:
|
|
for {
|
|
select {
|
|
case result := <-ch:
|
|
signatures[result.index] = result.signature
|
|
if result.err != nil && err == nil {
|
|
// only set the first one.
|
|
err = result.err
|
|
}
|
|
case <-done:
|
|
break loop
|
|
}
|
|
}
|
|
|
|
return signatures, err
|
|
}
|
|
|
|
func (s *signatureStore) Put(dgst digest.Digest, signatures ...[]byte) error {
|
|
bs := s.linkedBlobStore(s.ctx, dgst)
|
|
for _, signature := range signatures {
|
|
if _, err := bs.Put(s.ctx, "application/json", signature); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// linkedBlobStore returns the namedBlobStore of the signatures for the
|
|
// manifest with the given digest. Effectively, each signature link path
|
|
// layout is a unique linked blob store.
|
|
func (s *signatureStore) linkedBlobStore(ctx context.Context, revision digest.Digest) *linkedBlobStore {
|
|
linkpath := func(name string, dgst digest.Digest) (string, error) {
|
|
return pathFor(manifestSignatureLinkPathSpec{
|
|
name: name,
|
|
revision: revision,
|
|
signature: dgst,
|
|
})
|
|
|
|
}
|
|
|
|
return &linkedBlobStore{
|
|
ctx: ctx,
|
|
repository: s.repository,
|
|
blobStore: s.blobStore,
|
|
blobAccessController: &linkedBlobStatter{
|
|
blobStore: s.blobStore,
|
|
repository: s.repository,
|
|
linkPathFns: []linkPathFunc{linkpath},
|
|
},
|
|
linkPathFns: []linkPathFunc{linkpath},
|
|
}
|
|
}
|