-
- disablesignaturestore
- |
-
- no
- |
-
- Disables storage of signatures attached to schema1 manifests. By default
- signatures are detached from schema1 manifests, stored, and reattached
- when the manifest is requested. When this is true, the storage is disabled
- and a new signature is always generated for schema1 manifests using the
- schema1 signing key. Disabling signature storage will cause all newly
- uploaded signatures to be discarded. Existing stored signatures will not
- be removed but they will not be re-attached to the corresponding manifest.
- |
-
## Example: Development configuration
diff --git a/manifests.go b/manifests.go
index 3bf912a65..2ac7c8f21 100644
--- a/manifests.go
+++ b/manifests.go
@@ -61,12 +61,6 @@ type ManifestEnumerator interface {
Enumerate(ctx context.Context, ingester func(digest.Digest) error) error
}
-// SignaturesGetter provides an interface for getting the signatures of a schema1 manifest. If the digest
-// referred to is not a schema1 manifest, an error should be returned.
-type SignaturesGetter interface {
- GetSignatures(ctx context.Context, manifestDigest digest.Digest) ([]digest.Digest, error)
-}
-
// Describable is an interface for descriptors
type Describable interface {
Descriptor() Descriptor
diff --git a/notifications/listener_test.go b/notifications/listener_test.go
index d16a4560b..c7db5944e 100644
--- a/notifications/listener_test.go
+++ b/notifications/listener_test.go
@@ -20,7 +20,12 @@ import (
func TestListener(t *testing.T) {
ctx := context.Background()
- registry, err := storage.NewRegistry(ctx, inmemory.New(), storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), storage.EnableDelete, storage.EnableRedirect)
+ k, err := libtrust.GenerateECP256PrivateKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ registry, err := storage.NewRegistry(ctx, inmemory.New(), storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), storage.EnableDelete, storage.EnableRedirect, storage.Schema1SigningKey(k))
if err != nil {
t.Fatalf("error creating registry: %v", err)
}
diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go
index 523ecca28..01fd4f4c9 100644
--- a/registry/handlers/api_test.go
+++ b/registry/handlers/api_test.go
@@ -1067,13 +1067,13 @@ func testManifestAPISchema1(t *testing.T, env *testEnv, imageName reference.Name
t.Fatalf("error decoding fetched manifest: %v", err)
}
- // check two signatures were roundtripped
+ // check only 1 signature is returned
signatures, err = fetchedManifestByDigest.Signatures()
if err != nil {
t.Fatal(err)
}
- if len(signatures) != 2 {
+ if len(signatures) != 1 {
t.Fatalf("expected 2 signature from manifest, got: %d", len(signatures))
}
diff --git a/registry/handlers/app.go b/registry/handlers/app.go
index 4bda082be..384a61d6f 100644
--- a/registry/handlers/app.go
+++ b/registry/handlers/app.go
@@ -155,6 +155,7 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
app.configureRedis(config)
app.configureLogHook(config)
+ options := registrymiddleware.GetRegistryOptions()
if config.Compatibility.Schema1.TrustKey != "" {
app.trustKey, err = libtrust.LoadKeyFile(config.Compatibility.Schema1.TrustKey)
if err != nil {
@@ -169,6 +170,8 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
}
}
+ options = append(options, storage.Schema1SigningKey(app.trustKey))
+
if config.HTTP.Host != "" {
u, err := url.Parse(config.HTTP.Host)
if err != nil {
@@ -177,17 +180,10 @@ func NewApp(ctx context.Context, config *configuration.Configuration) *App {
app.httpHost = *u
}
- options := registrymiddleware.GetRegistryOptions()
-
if app.isCache {
options = append(options, storage.DisableDigestResumption)
}
- if config.Compatibility.Schema1.DisableSignatureStore {
- options = append(options, storage.DisableSchema1Signatures)
- options = append(options, storage.Schema1SigningKey(app.trustKey))
- }
-
// configure deletion
if d, ok := config.Storage["delete"]; ok {
e, ok := d["enabled"]
diff --git a/registry/proxy/proxymanifeststore_test.go b/registry/proxy/proxymanifeststore_test.go
index 1069d66c8..0d6b7171f 100644
--- a/registry/proxy/proxymanifeststore_test.go
+++ b/registry/proxy/proxymanifeststore_test.go
@@ -60,12 +60,6 @@ func (sm statsManifest) Put(ctx context.Context, manifest distribution.Manifest,
return sm.manifests.Put(ctx, manifest)
}
-/*func (sm statsManifest) Enumerate(ctx context.Context, manifests []distribution.Manifest, last distribution.Manifest) (n int, err error) {
- sm.stats["enumerate"]++
- return sm.manifests.Enumerate(ctx, manifests, last)
-}
-*/
-
type mockChallenger struct {
sync.Mutex
count int
@@ -75,7 +69,6 @@ type mockChallenger struct {
func (m *mockChallenger) tryEstablishChallenges(context.Context) error {
m.Lock()
defer m.Unlock()
-
m.count++
return nil
}
@@ -93,9 +86,15 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE
if err != nil {
t.Fatalf("unable to parse reference: %s", err)
}
+ k, err := libtrust.GenerateECP256PrivateKey()
+ if err != nil {
+ t.Fatal(err)
+ }
ctx := context.Background()
- truthRegistry, err := storage.NewRegistry(ctx, inmemory.New(), storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()))
+ truthRegistry, err := storage.NewRegistry(ctx, inmemory.New(),
+ storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()),
+ storage.Schema1SigningKey(k))
if err != nil {
t.Fatalf("error creating registry: %v", err)
}
@@ -117,7 +116,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE
t.Fatalf(err.Error())
}
- localRegistry, err := storage.NewRegistry(ctx, inmemory.New(), storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), storage.EnableRedirect, storage.DisableDigestResumption)
+ localRegistry, err := storage.NewRegistry(ctx, inmemory.New(), storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), storage.EnableRedirect, storage.DisableDigestResumption, storage.Schema1SigningKey(k))
if err != nil {
t.Fatalf("error creating registry: %v", err)
}
diff --git a/registry/root.go b/registry/root.go
index 7a7d44cb1..5d3005c26 100644
--- a/registry/root.go
+++ b/registry/root.go
@@ -69,7 +69,7 @@ var GCCmd = &cobra.Command{
os.Exit(1)
}
- registry, err := storage.NewRegistry(ctx, driver, storage.DisableSchema1Signatures, storage.Schema1SigningKey(k))
+ registry, err := storage.NewRegistry(ctx, driver, storage.Schema1SigningKey(k))
if err != nil {
fmt.Fprintf(os.Stderr, "failed to construct registry: %v", err)
os.Exit(1)
diff --git a/registry/storage/blobstore.go b/registry/storage/blobstore.go
index 9034cb689..84f6660f3 100644
--- a/registry/storage/blobstore.go
+++ b/registry/storage/blobstore.go
@@ -75,7 +75,6 @@ func (bs *blobStore) Put(ctx context.Context, mediaType string, p []byte) (distr
}
// TODO(stevvooe): Write out mediatype here, as well.
-
return distribution.Descriptor{
Size: int64(len(p)),
diff --git a/registry/storage/garbagecollect.go b/registry/storage/garbagecollect.go
index be64b8474..bc3404169 100644
--- a/registry/storage/garbagecollect.go
+++ b/registry/storage/garbagecollect.go
@@ -6,7 +6,6 @@ import (
"github.com/docker/distribution"
"github.com/docker/distribution/context"
"github.com/docker/distribution/digest"
- "github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
"github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/storage/driver"
@@ -71,22 +70,6 @@ func MarkAndSweep(ctx context.Context, storageDriver driver.StorageDriver, regis
}
switch manifest.(type) {
- case *schema1.SignedManifest:
- signaturesGetter, ok := manifestService.(distribution.SignaturesGetter)
- if !ok {
- return fmt.Errorf("unable to convert ManifestService into SignaturesGetter")
- }
- signatures, err := signaturesGetter.GetSignatures(ctx, dgst)
- if err != nil {
- return fmt.Errorf("failed to get signatures for signed manifest: %v", err)
- }
- for _, signatureDigest := range signatures {
- if dryRun {
- emit("%s: marking signature %s", repoName, signatureDigest)
- }
- markSet[signatureDigest] = struct{}{}
- }
- break
case *schema2.DeserializedManifest:
config := manifest.(*schema2.DeserializedManifest).Config
if dryRun {
diff --git a/registry/storage/garbagecollect_test.go b/registry/storage/garbagecollect_test.go
index a0ba154b6..86fc175a5 100644
--- a/registry/storage/garbagecollect_test.go
+++ b/registry/storage/garbagecollect_test.go
@@ -12,6 +12,7 @@ import (
"github.com/docker/distribution/registry/storage/driver"
"github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/docker/distribution/testutil"
+ "github.com/docker/libtrust"
)
type image struct {
@@ -22,7 +23,11 @@ type image struct {
func createRegistry(t *testing.T, driver driver.StorageDriver) distribution.Namespace {
ctx := context.Background()
- registry, err := NewRegistry(ctx, driver, EnableDelete)
+ k, err := libtrust.GenerateECP256PrivateKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+ registry, err := NewRegistry(ctx, driver, EnableDelete, Schema1SigningKey(k))
if err != nil {
t.Fatalf("Failed to construct namespace")
}
@@ -139,13 +144,13 @@ func TestNoDeletionNoEffect(t *testing.T) {
ctx := context.Background()
inmemoryDriver := inmemory.New()
- registry := createRegistry(t, inmemoryDriver)
+ registry := createRegistry(t, inmemory.New())
repo := makeRepository(t, registry, "palailogos")
manifestService, err := repo.Manifests(ctx)
image1 := uploadRandomSchema1Image(t, repo)
image2 := uploadRandomSchema1Image(t, repo)
- image3 := uploadRandomSchema2Image(t, repo)
+ uploadRandomSchema2Image(t, repo)
// construct manifestlist for fun.
blobstatter := registry.BlobStatter()
@@ -160,20 +165,17 @@ func TestNoDeletionNoEffect(t *testing.T) {
t.Fatalf("Failed to add manifest list: %v", err)
}
+ before := allBlobs(t, registry)
+
// Run GC
err = MarkAndSweep(context.Background(), inmemoryDriver, registry, false)
if err != nil {
t.Fatalf("Failed mark and sweep: %v", err)
}
- blobs := allBlobs(t, registry)
-
- // the +1 at the end is for the manifestList
- // the first +3 at the end for each manifest's blob
- // the second +3 at the end for each manifest's signature/config layer
- totalBlobCount := len(image1.layers) + len(image2.layers) + len(image3.layers) + 1 + 3 + 3
- if len(blobs) != totalBlobCount {
- t.Fatalf("Garbage collection affected storage")
+ after := allBlobs(t, registry)
+ if len(before) != len(after) {
+ t.Fatalf("Garbage collection affected storage: %d != %d", len(before), len(after))
}
}
diff --git a/registry/storage/manifeststore.go b/registry/storage/manifeststore.go
index 5a9165f90..68483c956 100644
--- a/registry/storage/manifeststore.go
+++ b/registry/storage/manifeststore.go
@@ -2,7 +2,6 @@ package storage
import (
"fmt"
- "path"
"encoding/json"
"github.com/docker/distribution"
@@ -12,7 +11,6 @@ import (
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
- "github.com/docker/distribution/registry/storage/driver"
)
// A ManifestHandler gets and puts manifests of a particular type.
@@ -141,48 +139,3 @@ func (ms *manifestStore) Enumerate(ctx context.Context, ingester func(digest.Dig
})
return err
}
-
-// Only valid for schema1 signed manifests
-func (ms *manifestStore) GetSignatures(ctx context.Context, manifestDigest digest.Digest) ([]digest.Digest, error) {
- // sanity check that digest refers to a schema1 digest
- manifest, err := ms.Get(ctx, manifestDigest)
- if err != nil {
- return nil, err
- }
-
- if _, ok := manifest.(*schema1.SignedManifest); !ok {
- return nil, fmt.Errorf("digest %v is not for schema1 manifest", manifestDigest)
- }
-
- signaturesPath, err := pathFor(manifestSignaturesPathSpec{
- name: ms.repository.Named().Name(),
- revision: manifestDigest,
- })
- if err != nil {
- return nil, err
- }
-
- var digests []digest.Digest
- alg := string(digest.SHA256)
- signaturePaths, err := ms.blobStore.driver.List(ctx, path.Join(signaturesPath, alg))
-
- switch err.(type) {
- case nil:
- break
- case driver.PathNotFoundError:
- // Manifest may have been pushed with signature store disabled
- return digests, nil
- default:
- return nil, err
- }
-
- for _, sigPath := range signaturePaths {
- sigdigest, err := digest.ParseDigest(alg + ":" + path.Base(sigPath))
- if err != nil {
- // merely found not a digest
- continue
- }
- digests = append(digests, sigdigest)
- }
- return digests, nil
-}
diff --git a/registry/storage/manifeststore_test.go b/registry/storage/manifeststore_test.go
index fcb5adf9a..cbd30c044 100644
--- a/registry/storage/manifeststore_test.go
+++ b/registry/storage/manifeststore_test.go
@@ -52,15 +52,11 @@ func newManifestStoreTestEnv(t *testing.T, name reference.Named, tag string, opt
}
func TestManifestStorage(t *testing.T) {
- testManifestStorage(t, BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), EnableDelete, EnableRedirect)
-}
-
-func TestManifestStorageDisabledSignatures(t *testing.T) {
k, err := libtrust.GenerateECP256PrivateKey()
if err != nil {
t.Fatal(err)
}
- testManifestStorage(t, BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), EnableDelete, EnableRedirect, DisableSchema1Signatures, Schema1SigningKey(k))
+ testManifestStorage(t, BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), EnableDelete, EnableRedirect, Schema1SigningKey(k))
}
func testManifestStorage(t *testing.T, options ...RegistryOption) {
@@ -71,7 +67,6 @@ func testManifestStorage(t *testing.T, options ...RegistryOption) {
if err != nil {
t.Fatal(err)
}
- equalSignatures := env.registry.(*registry).schema1SignaturesEnabled
m := schema1.Manifest{
Versioned: manifest.Versioned{
@@ -175,12 +170,6 @@ func testManifestStorage(t *testing.T, options ...RegistryOption) {
t.Fatalf("fetched payload does not match original payload: %q != %q", fetchedManifest.Canonical, sm.Canonical)
}
- if equalSignatures {
- if !reflect.DeepEqual(fetchedManifest, sm) {
- t.Fatalf("fetched manifest not equal: %#v != %#v", fetchedManifest.Manifest, sm.Manifest)
- }
- }
-
_, pl, err := fetchedManifest.Payload()
if err != nil {
t.Fatalf("error getting payload %#v", err)
@@ -223,12 +212,6 @@ func testManifestStorage(t *testing.T, options ...RegistryOption) {
t.Fatalf("fetched manifest not equal: %q != %q", byDigestManifest.Canonical, fetchedManifest.Canonical)
}
- if equalSignatures {
- if !reflect.DeepEqual(fetchedByDigest, fetchedManifest) {
- t.Fatalf("fetched manifest not equal: %#v != %#v", fetchedByDigest, fetchedManifest)
- }
- }
-
sigs, err := fetchedJWS.Signatures()
if err != nil {
t.Fatalf("unable to extract signatures: %v", err)
@@ -285,17 +268,6 @@ func testManifestStorage(t *testing.T, options ...RegistryOption) {
t.Fatalf("unexpected error verifying manifest: %v", err)
}
- // Assemble our payload and two signatures to get what we expect!
- expectedJWS, err := libtrust.NewJSONSignature(payload, sigs[0], sigs2[0])
- if err != nil {
- t.Fatalf("unexpected error merging jws: %v", err)
- }
-
- expectedSigs, err := expectedJWS.Signatures()
- if err != nil {
- t.Fatalf("unexpected error getting expected signatures: %v", err)
- }
-
_, pl, err = fetched.Payload()
if err != nil {
t.Fatalf("error getting payload %#v", err)
@@ -315,19 +287,6 @@ func testManifestStorage(t *testing.T, options ...RegistryOption) {
t.Fatalf("payloads are not equal")
}
- if equalSignatures {
- receivedSigs, err := receivedJWS.Signatures()
- if err != nil {
- t.Fatalf("error getting signatures: %v", err)
- }
-
- for i, sig := range receivedSigs {
- if !bytes.Equal(sig, expectedSigs[i]) {
- t.Fatalf("mismatched signatures from remote: %v != %v", string(sig), string(expectedSigs[i]))
- }
- }
- }
-
// Test deleting manifests
err = ms.Delete(ctx, dgst)
if err != nil {
diff --git a/registry/storage/paths.go b/registry/storage/paths.go
index 8985f043f..1b142b88f 100644
--- a/registry/storage/paths.go
+++ b/registry/storage/paths.go
@@ -30,8 +30,6 @@ const (
// revisions
// ->