From 4bd5c10fc8153a1eb04e0af10a5a3bb16ff9d306 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 25 Apr 2016 12:39:50 -0700 Subject: [PATCH 1/3] Add const for max size -1 for GetMeta Signed-off-by: Riyaz Faizullabhoy --- client/client_update_test.go | 16 +++++------ tuf/store/filestore.go | 2 +- tuf/store/httpstore.go | 2 +- tuf/store/interfaces.go | 3 ++ tuf/store/memorystore.go | 2 +- tuf/store/memorystore_test.go | 2 +- tuf/testutils/swizzler_test.go | 50 +++++++++++++++++----------------- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/client/client_update_test.go b/client/client_update_test.go index 1c99b32b32..2848d6664e 100644 --- a/client/client_update_test.go +++ b/client/client_update_test.go @@ -66,7 +66,7 @@ func readOnlyServer(t *testing.T, cache store.MetadataStore, notFoundStatus int, m := mux.NewRouter() handler := func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) - metaBytes, err := cache.GetMeta(vars["role"], -1) + metaBytes, err := cache.GetMeta(vars["role"], store.MaxSize) if _, ok := err.(store.ErrMetaNotFound); ok { w.WriteHeader(notFoundStatus) } else { @@ -111,7 +111,7 @@ func TestUpdateSucceedsEvenIfCannotWriteNewRepo(t *testing.T) { require.NoError(t, err) for r, expected := range serverMeta { - actual, err := repo.fileStore.GetMeta(r, -1) + actual, err := repo.fileStore.GetMeta(r, store.MaxSize) if r == role { require.Error(t, err) require.IsType(t, store.ErrMetaNotFound{}, err, @@ -158,7 +158,7 @@ func TestUpdateSucceedsEvenIfCannotWriteExistingRepo(t *testing.T) { require.NoError(t, err) for r, expected := range serverMeta { - actual, err := repo.fileStore.GetMeta(r, -1) + actual, err := repo.fileStore.GetMeta(r, store.MaxSize) require.NoError(t, err, "problem getting repo metadata for %s", r) if role == r { require.False(t, bytes.Equal(expected, actual), @@ -249,7 +249,7 @@ func TestUpdateReplacesCorruptOrMissingMetadata(t *testing.T) { } else { require.NoError(t, err) for r, expected := range serverMeta { - actual, err := repo.fileStore.GetMeta(r, -1) + actual, err := repo.fileStore.GetMeta(r, store.MaxSize) require.NoError(t, err, "problem getting repo metadata for %s", role) require.True(t, bytes.Equal(expected, actual), "%s for %s: expected to recover after update", text, role) @@ -298,7 +298,7 @@ func TestUpdateFailsIfServerRootKeyChangedWithoutMultiSign(t *testing.T) { text, messItUp := expt.desc, expt.swizzle for _, forWrite := range []bool{true, false} { require.NoError(t, messItUp(repoSwizzler, data.CanonicalRootRole), "could not fuzz root (%s)", text) - messedUpMeta, err := repo.fileStore.GetMeta(data.CanonicalRootRole, -1) + messedUpMeta, err := repo.fileStore.GetMeta(data.CanonicalRootRole, store.MaxSize) if _, ok := err.(store.ErrMetaNotFound); ok { // one of the ways to mess up is to delete metadata @@ -321,7 +321,7 @@ func TestUpdateFailsIfServerRootKeyChangedWithoutMultiSign(t *testing.T) { // same because it has failed to update. for role, expected := range origMeta { if role != data.CanonicalTimestampRole && role != data.CanonicalSnapshotRole { - actual, err := repo.fileStore.GetMeta(role, -1) + actual, err := repo.fileStore.GetMeta(role, store.MaxSize) require.NoError(t, err, "problem getting repo metadata for %s", role) if role == data.CanonicalRootRole { @@ -967,7 +967,7 @@ func waysToMessUpServerNonRootPerRole(t *testing.T) map[string][]swizzleExpectat keyIDs = append(keyIDs, k) } // add the keys from root too - rootMeta, err := s.MetadataCache.GetMeta(data.CanonicalRootRole, -1) + rootMeta, err := s.MetadataCache.GetMeta(data.CanonicalRootRole, store.MaxSize) require.NoError(t, err) signedRoot := &data.SignedRoot{} @@ -1374,7 +1374,7 @@ func TestValidateRootRotationWithOldRole(t *testing.T) { // --- key is saved, but doesn't matter at all for rotation if we're already on // --- the root metadata with the 3 keys) - rootBytes, err := serverSwizzler.MetadataCache.GetMeta(data.CanonicalRootRole, -1) + rootBytes, err := serverSwizzler.MetadataCache.GetMeta(data.CanonicalRootRole, store.MaxSize) require.NoError(t, err) signedRoot := data.SignedRoot{} require.NoError(t, json.Unmarshal(rootBytes, &signedRoot)) diff --git a/tuf/store/filestore.go b/tuf/store/filestore.go index 87ac820de0..d5cd0baa6a 100644 --- a/tuf/store/filestore.go +++ b/tuf/store/filestore.go @@ -49,7 +49,7 @@ func (f *FilesystemStore) GetMeta(name string, size int64) ([]byte, error) { } return nil, err } - if size == -1 { + if size == MaxSize { size = notary.MaxDownloadSize } // Only return up to size bytes diff --git a/tuf/store/httpstore.go b/tuf/store/httpstore.go index 8b0d850114..25bce062c8 100644 --- a/tuf/store/httpstore.go +++ b/tuf/store/httpstore.go @@ -158,7 +158,7 @@ func (s HTTPStore) GetMeta(name string, size int64) ([]byte, error) { logrus.Debugf("received HTTP status %d when requesting %s.", resp.StatusCode, name) return nil, err } - if size == -1 { + if size == MaxSize { size = notary.MaxDownloadSize } if resp.ContentLength > size { diff --git a/tuf/store/interfaces.go b/tuf/store/interfaces.go index dd307168bf..3aeae5f095 100644 --- a/tuf/store/interfaces.go +++ b/tuf/store/interfaces.go @@ -1,5 +1,8 @@ package store +// MaxSize is represented as -1 for arguments to GetMeta +const MaxSize int64 = -1 + // MetadataStore must be implemented by anything that intends to interact // with a store of TUF files type MetadataStore interface { diff --git a/tuf/store/memorystore.go b/tuf/store/memorystore.go index 493bb6f0b5..a6954da6fb 100644 --- a/tuf/store/memorystore.go +++ b/tuf/store/memorystore.go @@ -45,7 +45,7 @@ type MemoryStore struct { func (m *MemoryStore) GetMeta(name string, size int64) ([]byte, error) { d, ok := m.meta[name] if ok { - if size == -1 { + if size == MaxSize { size = notary.MaxDownloadSize } if int64(len(d)) < size { diff --git a/tuf/store/memorystore_test.go b/tuf/store/memorystore_test.go index 5177a30ef6..8ebe0a005b 100644 --- a/tuf/store/memorystore_test.go +++ b/tuf/store/memorystore_test.go @@ -64,7 +64,7 @@ func TestMemoryStoreGetMetaSize(t *testing.T) { require.Equal(t, []byte{}, meta) // we can get the whole thing by passing -1 - meta, err = s.GetMeta("content", -1) + meta, err = s.GetMeta("content", MaxSize) require.NoError(t, err) require.Equal(t, content, meta) diff --git a/tuf/testutils/swizzler_test.go b/tuf/testutils/swizzler_test.go index f25f134314..4701be4f71 100644 --- a/tuf/testutils/swizzler_test.go +++ b/tuf/testutils/swizzler_test.go @@ -80,7 +80,7 @@ func TestSwizzlerSetInvalidJSON(t *testing.T) { f.SetInvalidJSON(data.CanonicalSnapshotRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalSnapshotRole { @@ -105,7 +105,7 @@ func TestSwizzlerAddExtraSpace(t *testing.T) { require.NoError(t, json.Unmarshal(origMeta[data.CanonicalSnapshotRole], snapshot)) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -136,7 +136,7 @@ func TestSwizzlerSetInvalidSigned(t *testing.T) { f.SetInvalidSigned(data.CanonicalTargetsRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -161,7 +161,7 @@ func TestSwizzlerSetInvalidSignedMeta(t *testing.T) { require.NoError(t, err) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -185,7 +185,7 @@ func TestSwizzlerSetInvalidMetadataType(t *testing.T) { f.SetInvalidMetadataType(data.CanonicalTargetsRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -208,7 +208,7 @@ func TestSwizzlerInvalidateMetadataSignatures(t *testing.T) { f.InvalidateMetadataSignatures(data.CanonicalRootRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -240,7 +240,7 @@ func TestSwizzlerRemoveMetadata(t *testing.T) { f.RemoveMetadata("targets/a") for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) if role != "targets/a" { require.NoError(t, err) require.True(t, bytes.Equal(metaBytes, newMeta), "bytes have changed for role %s", role) @@ -258,7 +258,7 @@ func TestSwizzlerSignMetadataWithInvalidKey(t *testing.T) { f.SignMetadataWithInvalidKey(data.CanonicalTimestampRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalTimestampRole { @@ -285,7 +285,7 @@ func TestSwizzlerOffsetMetadataVersion(t *testing.T) { f.OffsetMetadataVersion("targets/a", -2) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != "targets/a" { @@ -309,7 +309,7 @@ func TestSwizzlerExpireMetadata(t *testing.T) { require.NoError(t, err) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -334,7 +334,7 @@ func TestSwizzlerSetThresholdBaseRole(t *testing.T) { require.NoError(t, err) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) // the threshold for base roles is set in root @@ -362,7 +362,7 @@ func TestSwizzlerSetThresholdDelegatedRole(t *testing.T) { f.SetThreshold("targets/a/b", 3) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) // the threshold for "targets/a/b" is in "targets/a" @@ -392,7 +392,7 @@ func TestSwizzlerChangeRootKey(t *testing.T) { for _, role := range roles { origMeta := origMeta[role] - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) // the threshold for base roles is set in root @@ -437,7 +437,7 @@ func TestSwizzlerUpdateSnapshotHashesSpecifiedRoles(t *testing.T) { // nothing has changed, signed data should be the same (signatures might // change because signatures may have random elements f.UpdateSnapshotHashes(data.CanonicalTargetsRole) - newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, -1) + newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) origSigned, newSigned := &data.Signed{}, &data.Signed{} require.NoError(t, json.Unmarshal(origMeta[data.CanonicalSnapshotRole], origSigned)) @@ -451,7 +451,7 @@ func TestSwizzlerUpdateSnapshotHashesSpecifiedRoles(t *testing.T) { // update the snapshot with just 1 role f.UpdateSnapshotHashes(data.CanonicalTargetsRole) - newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, -1) + newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) require.NoError(t, err) require.False(t, bytes.Equal(origMeta[data.CanonicalSnapshotRole], newMeta)) @@ -481,7 +481,7 @@ func TestSwizzlerUpdateSnapshotHashesNoSpecifiedRoles(t *testing.T) { // nothing has changed, signed data should be the same (signatures might // change because signatures may have random elements f.UpdateSnapshotHashes() - newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, -1) + newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) require.NoError(t, err) origSigned, newSigned := &data.Signed{}, &data.Signed{} @@ -496,7 +496,7 @@ func TestSwizzlerUpdateSnapshotHashesNoSpecifiedRoles(t *testing.T) { // update the snapshot with just no specified roles f.UpdateSnapshotHashes() - newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, -1) + newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) require.NoError(t, err) require.False(t, bytes.Equal(origMeta[data.CanonicalSnapshotRole], newMeta)) @@ -527,7 +527,7 @@ func TestSwizzlerUpdateTimestamp(t *testing.T) { // nothing has changed, signed data should be the same (signatures might // change because signatures may have random elements f.UpdateTimestampHash() - newMeta, err := f.MetadataCache.GetMeta(data.CanonicalTimestampRole, -1) + newMeta, err := f.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.MaxSize) require.NoError(t, err) origSigned, newSigned := &data.Signed{}, &data.Signed{} @@ -540,7 +540,7 @@ func TestSwizzlerUpdateTimestamp(t *testing.T) { // update the timestamp f.UpdateTimestampHash() - newMeta, err = f.MetadataCache.GetMeta(data.CanonicalTimestampRole, -1) + newMeta, err = f.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.MaxSize) require.NoError(t, err) require.False(t, bytes.Equal(origMeta[data.CanonicalTimestampRole], newMeta)) @@ -584,7 +584,7 @@ func TestSwizzlerMutateRoot(t *testing.T) { require.NoError(t, f.MutateRoot(func(r *data.Root) { r.Roles["hello"] = nil })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -610,7 +610,7 @@ func TestSwizzlerMutateTimestamp(t *testing.T) { require.NoError(t, f.MutateTimestamp(func(t *data.Timestamp) { t.Meta["hello"] = data.FileMeta{} })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalTimestampRole { @@ -633,7 +633,7 @@ func TestSwizzlerMutateSnapshot(t *testing.T) { require.NoError(t, f.MutateSnapshot(func(s *data.Snapshot) { s.Meta["hello"] = data.FileMeta{} })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalSnapshotRole { @@ -656,7 +656,7 @@ func TestSwizzlerMutateTargets(t *testing.T) { require.NoError(t, f.MutateTargets(func(t *data.Targets) { t.Targets["hello"] = data.FileMeta{} })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -684,7 +684,7 @@ func TestSwizzlerRotateKeyBaseRole(t *testing.T) { require.NoError(t, f.RotateKey(theRole, pubKey)) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -716,7 +716,7 @@ func TestSwizzlerRotateKeyDelegationRole(t *testing.T) { require.NoError(t, f.RotateKey(theRole, pubKey)) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, -1) + newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) require.NoError(t, err) if role != "targets/a" { From fa1ead35e21d3eb8158b776d1fc93cb3444baba4 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Tue, 26 Apr 2016 09:56:11 -0700 Subject: [PATCH 2/3] More occurrences of -1 and fixup comments Signed-off-by: Riyaz Faizullabhoy --- client/client.go | 6 +++--- tuf/store/filestore.go | 2 +- tuf/store/filestore_test.go | 4 ++-- tuf/store/httpstore.go | 3 ++- tuf/store/httpstore_test.go | 2 +- tuf/store/memorystore.go | 7 ++++--- tuf/store/memorystore_test.go | 2 +- tuf/testutils/swizzler.go | 20 ++++++++++---------- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/client/client.go b/client/client.go index 4455b62776..391b754526 100644 --- a/client/client.go +++ b/client/client.go @@ -649,7 +649,7 @@ func (r *NotaryRepository) bootstrapRepo() error { logrus.Debugf("Loading trusted collection.") for _, role := range data.BaseRoles { - jsonBytes, err := r.fileStore.GetMeta(role, -1) + jsonBytes, err := r.fileStore.GetMeta(role, store.MaxSize) if err != nil { if _, ok := err.(store.ErrMetaNotFound); ok && // server snapshots are supported, and server timestamp management @@ -781,7 +781,7 @@ func (r *NotaryRepository) bootstrapClient(checkInitialized bool) (*tufclient.Cl // during update which will cause us to download a new root and perform a rotation. // If we have an old root, and it's valid, then we overwrite the newBuilder to be one // preloaded with the old root or one which uses the old root for trust bootstrapping. - if rootJSON, err := r.fileStore.GetMeta(data.CanonicalRootRole, -1); err == nil { + if rootJSON, err := r.fileStore.GetMeta(data.CanonicalRootRole, store.MaxSize); err == nil { // if we can't load the cached root, fail hard because that is how we pin trust if err := oldBuilder.Load(data.CanonicalRootRole, rootJSON, minVersion, true); err != nil { return nil, err @@ -808,7 +808,7 @@ func (r *NotaryRepository) bootstrapClient(checkInitialized bool) (*tufclient.Cl // if remote store successfully set up, try and get root from remote // We don't have any local data to determine the size of root, so try the maximum (though it is restricted at 100MB) - tmpJSON, err := remote.GetMeta(data.CanonicalRootRole, -1) + tmpJSON, err := remote.GetMeta(data.CanonicalRootRole, store.MaxSize) if err != nil { // we didn't have a root in cache and were unable to load one from // the server. Nothing we can do but error. diff --git a/tuf/store/filestore.go b/tuf/store/filestore.go index d5cd0baa6a..21e9fbd697 100644 --- a/tuf/store/filestore.go +++ b/tuf/store/filestore.go @@ -39,7 +39,7 @@ func (f *FilesystemStore) getPath(name string) string { } // GetMeta returns the meta for the given name (a role) up to size bytes -// If size is -1, this corresponds to "infinite," but we cut off at the +// If size is "MaxSize", this corresponds to "infinite," but we cut off at a // predefined threshold "notary.MaxDownloadSize". func (f *FilesystemStore) GetMeta(name string, size int64) ([]byte, error) { meta, err := ioutil.ReadFile(f.getPath(name)) diff --git a/tuf/store/filestore_test.go b/tuf/store/filestore_test.go index a3db850074..72c705bba8 100644 --- a/tuf/store/filestore_test.go +++ b/tuf/store/filestore_test.go @@ -85,8 +85,8 @@ func TestGetMeta(t *testing.T) { require.Equal(t, testContent, content, "Content read from file was corrupted.") - // Check that -1 size reads everything - content, err = s.GetMeta("testMeta", int64(-1)) + // Check that MaxSize size reads everything + content, err = s.GetMeta("testMeta", MaxSize) require.Nil(t, err, "GetMeta returned unexpected error: %v", err) require.Equal(t, testContent, content, "Content read from file was corrupted.") diff --git a/tuf/store/httpstore.go b/tuf/store/httpstore.go index 25bce062c8..988ede1621 100644 --- a/tuf/store/httpstore.go +++ b/tuf/store/httpstore.go @@ -139,7 +139,8 @@ func translateStatusToError(resp *http.Response, resource string) error { // GetMeta downloads the named meta file with the given size. A short body // is acceptable because in the case of timestamp.json, the size is a cap, // not an exact length. -// If size is -1, this corresponds to "infinite," but we cut off at 100MB +// If size is "MaxSize", this corresponds to "infinite," but we cut off at a +// predefined threshold "notary.MaxDownloadSize". func (s HTTPStore) GetMeta(name string, size int64) ([]byte, error) { url, err := s.buildMetaURL(name) if err != nil { diff --git a/tuf/store/httpstore_test.go b/tuf/store/httpstore_test.go index 90daaa8e6e..372a46deef 100644 --- a/tuf/store/httpstore_test.go +++ b/tuf/store/httpstore_test.go @@ -95,7 +95,7 @@ func TestHTTPStoreGetAllMeta(t *testing.T) { if err != nil { t.Fatal(err) } - j, err := store.GetMeta("root", -1) + j, err := store.GetMeta("root", MaxSize) if err != nil { t.Fatal(err) } diff --git a/tuf/store/memorystore.go b/tuf/store/memorystore.go index a6954da6fb..cb76a88522 100644 --- a/tuf/store/memorystore.go +++ b/tuf/store/memorystore.go @@ -39,9 +39,10 @@ type MemoryStore struct { } // GetMeta returns up to size bytes of data references by name. -// If size is -1, this corresponds to "infinite," but we cut off at 100MB -// as we will always know the size for everything but a timestamp and -// sometimes a root, neither of which should be exceptionally large +// If size is "MaxSize", this corresponds to "infinite," but we cut off at a +// predefined threshold "notary.MaxDownloadSize", as we will always know the +// size for everything but a timestamp and sometimes a root, +// neither of which should be exceptionally large func (m *MemoryStore) GetMeta(name string, size int64) ([]byte, error) { d, ok := m.meta[name] if ok { diff --git a/tuf/store/memorystore_test.go b/tuf/store/memorystore_test.go index 8ebe0a005b..0ff06b5d5e 100644 --- a/tuf/store/memorystore_test.go +++ b/tuf/store/memorystore_test.go @@ -63,7 +63,7 @@ func TestMemoryStoreGetMetaSize(t *testing.T) { require.NoError(t, err) require.Equal(t, []byte{}, meta) - // we can get the whole thing by passing -1 + // we can get the whole thing by passing MaxSize (-1) meta, err = s.GetMeta("content", MaxSize) require.NoError(t, err) require.Equal(t, content, meta) diff --git a/tuf/testutils/swizzler.go b/tuf/testutils/swizzler.go index 2f746c81d5..dd004b7059 100644 --- a/tuf/testutils/swizzler.go +++ b/tuf/testutils/swizzler.go @@ -89,7 +89,7 @@ func serializeMetadata(cs signed.CryptoService, s *data.Signed, role string, // gets a Signed from the metadata store func signedFromStore(cache store.MetadataStore, role string) (*data.Signed, error) { - b, err := cache.GetMeta(role, -1) + b, err := cache.GetMeta(role, store.MaxSize) if err != nil { return nil, err } @@ -122,7 +122,7 @@ func NewMetadataSwizzler(gun string, initialMetadata map[string][]byte, // SetInvalidJSON corrupts metadata into something that is no longer valid JSON func (m *MetadataSwizzler) SetInvalidJSON(role string) error { - metaBytes, err := m.MetadataCache.GetMeta(role, -1) + metaBytes, err := m.MetadataCache.GetMeta(role, store.MaxSize) if err != nil { return err } @@ -133,7 +133,7 @@ func (m *MetadataSwizzler) SetInvalidJSON(role string) error { // JSON bytes, which should not affect serialization, but will change the checksum // of the file. func (m *MetadataSwizzler) AddExtraSpace(role string) error { - metaBytes, err := m.MetadataCache.GetMeta(role, -1) + metaBytes, err := m.MetadataCache.GetMeta(role, store.MaxSize) if err != nil { return err } @@ -357,7 +357,7 @@ func (m *MetadataSwizzler) SetThreshold(role string, newThreshold int) error { roleSpecifier = path.Dir(role) } - b, err := m.MetadataCache.GetMeta(roleSpecifier, -1) + b, err := m.MetadataCache.GetMeta(roleSpecifier, store.MaxSize) if err != nil { return err } @@ -413,7 +413,7 @@ func (m *MetadataSwizzler) RotateKey(role string, key data.PublicKey) error { roleSpecifier = path.Dir(role) } - b, err := m.MetadataCache.GetMeta(roleSpecifier, -1) + b, err := m.MetadataCache.GetMeta(roleSpecifier, store.MaxSize) if err != nil { return err } @@ -471,7 +471,7 @@ func (m *MetadataSwizzler) ChangeRootKey() error { return err } - b, err := m.MetadataCache.GetMeta(data.CanonicalRootRole, -1) + b, err := m.MetadataCache.GetMeta(data.CanonicalRootRole, store.MaxSize) if err != nil { return err } @@ -509,7 +509,7 @@ func (m *MetadataSwizzler) UpdateSnapshotHashes(roles ...string) error { snapshotSigned *data.Signed err error ) - if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, -1); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize); err != nil { return err } @@ -525,7 +525,7 @@ func (m *MetadataSwizzler) UpdateSnapshotHashes(roles ...string) error { for _, role := range roles { if role != data.CanonicalSnapshotRole && role != data.CanonicalTimestampRole { - if metaBytes, err = m.MetadataCache.GetMeta(role, -1); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(role, store.MaxSize); err != nil { return err } @@ -561,7 +561,7 @@ func (m *MetadataSwizzler) UpdateTimestampHash() error { timestampSigned *data.Signed err error ) - if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalTimestampRole, -1); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.MaxSize); err != nil { return err } // we can't just create a new timestamp, because then the expiry would be @@ -570,7 +570,7 @@ func (m *MetadataSwizzler) UpdateTimestampHash() error { return err } - if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, -1); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize); err != nil { return err } From 7e6c15d7e1ad08a2fcc8c9c0eb2cf8ed1b3154e7 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Tue, 26 Apr 2016 10:27:56 -0700 Subject: [PATCH 3/3] Rename constant Signed-off-by: Riyaz Faizullabhoy --- client/client.go | 6 ++-- client/client_update_test.go | 16 +++++------ tuf/store/filestore.go | 4 +-- tuf/store/filestore_test.go | 4 +-- tuf/store/httpstore.go | 4 +-- tuf/store/httpstore_test.go | 2 +- tuf/store/interfaces.go | 4 +-- tuf/store/memorystore.go | 4 +-- tuf/store/memorystore_test.go | 4 +-- tuf/testutils/swizzler.go | 20 +++++++------- tuf/testutils/swizzler_test.go | 50 +++++++++++++++++----------------- 11 files changed, 59 insertions(+), 59 deletions(-) diff --git a/client/client.go b/client/client.go index 391b754526..55f83c496d 100644 --- a/client/client.go +++ b/client/client.go @@ -649,7 +649,7 @@ func (r *NotaryRepository) bootstrapRepo() error { logrus.Debugf("Loading trusted collection.") for _, role := range data.BaseRoles { - jsonBytes, err := r.fileStore.GetMeta(role, store.MaxSize) + jsonBytes, err := r.fileStore.GetMeta(role, store.NoSizeLimit) if err != nil { if _, ok := err.(store.ErrMetaNotFound); ok && // server snapshots are supported, and server timestamp management @@ -781,7 +781,7 @@ func (r *NotaryRepository) bootstrapClient(checkInitialized bool) (*tufclient.Cl // during update which will cause us to download a new root and perform a rotation. // If we have an old root, and it's valid, then we overwrite the newBuilder to be one // preloaded with the old root or one which uses the old root for trust bootstrapping. - if rootJSON, err := r.fileStore.GetMeta(data.CanonicalRootRole, store.MaxSize); err == nil { + if rootJSON, err := r.fileStore.GetMeta(data.CanonicalRootRole, store.NoSizeLimit); err == nil { // if we can't load the cached root, fail hard because that is how we pin trust if err := oldBuilder.Load(data.CanonicalRootRole, rootJSON, minVersion, true); err != nil { return nil, err @@ -808,7 +808,7 @@ func (r *NotaryRepository) bootstrapClient(checkInitialized bool) (*tufclient.Cl // if remote store successfully set up, try and get root from remote // We don't have any local data to determine the size of root, so try the maximum (though it is restricted at 100MB) - tmpJSON, err := remote.GetMeta(data.CanonicalRootRole, store.MaxSize) + tmpJSON, err := remote.GetMeta(data.CanonicalRootRole, store.NoSizeLimit) if err != nil { // we didn't have a root in cache and were unable to load one from // the server. Nothing we can do but error. diff --git a/client/client_update_test.go b/client/client_update_test.go index 2848d6664e..ef9c3c0edd 100644 --- a/client/client_update_test.go +++ b/client/client_update_test.go @@ -66,7 +66,7 @@ func readOnlyServer(t *testing.T, cache store.MetadataStore, notFoundStatus int, m := mux.NewRouter() handler := func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) - metaBytes, err := cache.GetMeta(vars["role"], store.MaxSize) + metaBytes, err := cache.GetMeta(vars["role"], store.NoSizeLimit) if _, ok := err.(store.ErrMetaNotFound); ok { w.WriteHeader(notFoundStatus) } else { @@ -111,7 +111,7 @@ func TestUpdateSucceedsEvenIfCannotWriteNewRepo(t *testing.T) { require.NoError(t, err) for r, expected := range serverMeta { - actual, err := repo.fileStore.GetMeta(r, store.MaxSize) + actual, err := repo.fileStore.GetMeta(r, store.NoSizeLimit) if r == role { require.Error(t, err) require.IsType(t, store.ErrMetaNotFound{}, err, @@ -158,7 +158,7 @@ func TestUpdateSucceedsEvenIfCannotWriteExistingRepo(t *testing.T) { require.NoError(t, err) for r, expected := range serverMeta { - actual, err := repo.fileStore.GetMeta(r, store.MaxSize) + actual, err := repo.fileStore.GetMeta(r, store.NoSizeLimit) require.NoError(t, err, "problem getting repo metadata for %s", r) if role == r { require.False(t, bytes.Equal(expected, actual), @@ -249,7 +249,7 @@ func TestUpdateReplacesCorruptOrMissingMetadata(t *testing.T) { } else { require.NoError(t, err) for r, expected := range serverMeta { - actual, err := repo.fileStore.GetMeta(r, store.MaxSize) + actual, err := repo.fileStore.GetMeta(r, store.NoSizeLimit) require.NoError(t, err, "problem getting repo metadata for %s", role) require.True(t, bytes.Equal(expected, actual), "%s for %s: expected to recover after update", text, role) @@ -298,7 +298,7 @@ func TestUpdateFailsIfServerRootKeyChangedWithoutMultiSign(t *testing.T) { text, messItUp := expt.desc, expt.swizzle for _, forWrite := range []bool{true, false} { require.NoError(t, messItUp(repoSwizzler, data.CanonicalRootRole), "could not fuzz root (%s)", text) - messedUpMeta, err := repo.fileStore.GetMeta(data.CanonicalRootRole, store.MaxSize) + messedUpMeta, err := repo.fileStore.GetMeta(data.CanonicalRootRole, store.NoSizeLimit) if _, ok := err.(store.ErrMetaNotFound); ok { // one of the ways to mess up is to delete metadata @@ -321,7 +321,7 @@ func TestUpdateFailsIfServerRootKeyChangedWithoutMultiSign(t *testing.T) { // same because it has failed to update. for role, expected := range origMeta { if role != data.CanonicalTimestampRole && role != data.CanonicalSnapshotRole { - actual, err := repo.fileStore.GetMeta(role, store.MaxSize) + actual, err := repo.fileStore.GetMeta(role, store.NoSizeLimit) require.NoError(t, err, "problem getting repo metadata for %s", role) if role == data.CanonicalRootRole { @@ -967,7 +967,7 @@ func waysToMessUpServerNonRootPerRole(t *testing.T) map[string][]swizzleExpectat keyIDs = append(keyIDs, k) } // add the keys from root too - rootMeta, err := s.MetadataCache.GetMeta(data.CanonicalRootRole, store.MaxSize) + rootMeta, err := s.MetadataCache.GetMeta(data.CanonicalRootRole, store.NoSizeLimit) require.NoError(t, err) signedRoot := &data.SignedRoot{} @@ -1374,7 +1374,7 @@ func TestValidateRootRotationWithOldRole(t *testing.T) { // --- key is saved, but doesn't matter at all for rotation if we're already on // --- the root metadata with the 3 keys) - rootBytes, err := serverSwizzler.MetadataCache.GetMeta(data.CanonicalRootRole, store.MaxSize) + rootBytes, err := serverSwizzler.MetadataCache.GetMeta(data.CanonicalRootRole, store.NoSizeLimit) require.NoError(t, err) signedRoot := data.SignedRoot{} require.NoError(t, json.Unmarshal(rootBytes, &signedRoot)) diff --git a/tuf/store/filestore.go b/tuf/store/filestore.go index 21e9fbd697..401e7ee421 100644 --- a/tuf/store/filestore.go +++ b/tuf/store/filestore.go @@ -39,7 +39,7 @@ func (f *FilesystemStore) getPath(name string) string { } // GetMeta returns the meta for the given name (a role) up to size bytes -// If size is "MaxSize", this corresponds to "infinite," but we cut off at a +// If size is "NoSizeLimit", this corresponds to "infinite," but we cut off at a // predefined threshold "notary.MaxDownloadSize". func (f *FilesystemStore) GetMeta(name string, size int64) ([]byte, error) { meta, err := ioutil.ReadFile(f.getPath(name)) @@ -49,7 +49,7 @@ func (f *FilesystemStore) GetMeta(name string, size int64) ([]byte, error) { } return nil, err } - if size == MaxSize { + if size == NoSizeLimit { size = notary.MaxDownloadSize } // Only return up to size bytes diff --git a/tuf/store/filestore_test.go b/tuf/store/filestore_test.go index 72c705bba8..ebdd1944cb 100644 --- a/tuf/store/filestore_test.go +++ b/tuf/store/filestore_test.go @@ -85,8 +85,8 @@ func TestGetMeta(t *testing.T) { require.Equal(t, testContent, content, "Content read from file was corrupted.") - // Check that MaxSize size reads everything - content, err = s.GetMeta("testMeta", MaxSize) + // Check that NoSizeLimit size reads everything + content, err = s.GetMeta("testMeta", NoSizeLimit) require.Nil(t, err, "GetMeta returned unexpected error: %v", err) require.Equal(t, testContent, content, "Content read from file was corrupted.") diff --git a/tuf/store/httpstore.go b/tuf/store/httpstore.go index 988ede1621..a925786616 100644 --- a/tuf/store/httpstore.go +++ b/tuf/store/httpstore.go @@ -139,7 +139,7 @@ func translateStatusToError(resp *http.Response, resource string) error { // GetMeta downloads the named meta file with the given size. A short body // is acceptable because in the case of timestamp.json, the size is a cap, // not an exact length. -// If size is "MaxSize", this corresponds to "infinite," but we cut off at a +// If size is "NoSizeLimit", this corresponds to "infinite," but we cut off at a // predefined threshold "notary.MaxDownloadSize". func (s HTTPStore) GetMeta(name string, size int64) ([]byte, error) { url, err := s.buildMetaURL(name) @@ -159,7 +159,7 @@ func (s HTTPStore) GetMeta(name string, size int64) ([]byte, error) { logrus.Debugf("received HTTP status %d when requesting %s.", resp.StatusCode, name) return nil, err } - if size == MaxSize { + if size == NoSizeLimit { size = notary.MaxDownloadSize } if resp.ContentLength > size { diff --git a/tuf/store/httpstore_test.go b/tuf/store/httpstore_test.go index 372a46deef..705a6a09cc 100644 --- a/tuf/store/httpstore_test.go +++ b/tuf/store/httpstore_test.go @@ -95,7 +95,7 @@ func TestHTTPStoreGetAllMeta(t *testing.T) { if err != nil { t.Fatal(err) } - j, err := store.GetMeta("root", MaxSize) + j, err := store.GetMeta("root", NoSizeLimit) if err != nil { t.Fatal(err) } diff --git a/tuf/store/interfaces.go b/tuf/store/interfaces.go index 3aeae5f095..8ccec34831 100644 --- a/tuf/store/interfaces.go +++ b/tuf/store/interfaces.go @@ -1,7 +1,7 @@ package store -// MaxSize is represented as -1 for arguments to GetMeta -const MaxSize int64 = -1 +// NoSizeLimit is represented as -1 for arguments to GetMeta +const NoSizeLimit int64 = -1 // MetadataStore must be implemented by anything that intends to interact // with a store of TUF files diff --git a/tuf/store/memorystore.go b/tuf/store/memorystore.go index cb76a88522..77c03c7198 100644 --- a/tuf/store/memorystore.go +++ b/tuf/store/memorystore.go @@ -39,14 +39,14 @@ type MemoryStore struct { } // GetMeta returns up to size bytes of data references by name. -// If size is "MaxSize", this corresponds to "infinite," but we cut off at a +// If size is "NoSizeLimit", this corresponds to "infinite," but we cut off at a // predefined threshold "notary.MaxDownloadSize", as we will always know the // size for everything but a timestamp and sometimes a root, // neither of which should be exceptionally large func (m *MemoryStore) GetMeta(name string, size int64) ([]byte, error) { d, ok := m.meta[name] if ok { - if size == MaxSize { + if size == NoSizeLimit { size = notary.MaxDownloadSize } if int64(len(d)) < size { diff --git a/tuf/store/memorystore_test.go b/tuf/store/memorystore_test.go index 0ff06b5d5e..716bb7bc2d 100644 --- a/tuf/store/memorystore_test.go +++ b/tuf/store/memorystore_test.go @@ -63,8 +63,8 @@ func TestMemoryStoreGetMetaSize(t *testing.T) { require.NoError(t, err) require.Equal(t, []byte{}, meta) - // we can get the whole thing by passing MaxSize (-1) - meta, err = s.GetMeta("content", MaxSize) + // we can get the whole thing by passing NoSizeLimit (-1) + meta, err = s.GetMeta("content", NoSizeLimit) require.NoError(t, err) require.Equal(t, content, meta) diff --git a/tuf/testutils/swizzler.go b/tuf/testutils/swizzler.go index dd004b7059..b66a793f76 100644 --- a/tuf/testutils/swizzler.go +++ b/tuf/testutils/swizzler.go @@ -89,7 +89,7 @@ func serializeMetadata(cs signed.CryptoService, s *data.Signed, role string, // gets a Signed from the metadata store func signedFromStore(cache store.MetadataStore, role string) (*data.Signed, error) { - b, err := cache.GetMeta(role, store.MaxSize) + b, err := cache.GetMeta(role, store.NoSizeLimit) if err != nil { return nil, err } @@ -122,7 +122,7 @@ func NewMetadataSwizzler(gun string, initialMetadata map[string][]byte, // SetInvalidJSON corrupts metadata into something that is no longer valid JSON func (m *MetadataSwizzler) SetInvalidJSON(role string) error { - metaBytes, err := m.MetadataCache.GetMeta(role, store.MaxSize) + metaBytes, err := m.MetadataCache.GetMeta(role, store.NoSizeLimit) if err != nil { return err } @@ -133,7 +133,7 @@ func (m *MetadataSwizzler) SetInvalidJSON(role string) error { // JSON bytes, which should not affect serialization, but will change the checksum // of the file. func (m *MetadataSwizzler) AddExtraSpace(role string) error { - metaBytes, err := m.MetadataCache.GetMeta(role, store.MaxSize) + metaBytes, err := m.MetadataCache.GetMeta(role, store.NoSizeLimit) if err != nil { return err } @@ -357,7 +357,7 @@ func (m *MetadataSwizzler) SetThreshold(role string, newThreshold int) error { roleSpecifier = path.Dir(role) } - b, err := m.MetadataCache.GetMeta(roleSpecifier, store.MaxSize) + b, err := m.MetadataCache.GetMeta(roleSpecifier, store.NoSizeLimit) if err != nil { return err } @@ -413,7 +413,7 @@ func (m *MetadataSwizzler) RotateKey(role string, key data.PublicKey) error { roleSpecifier = path.Dir(role) } - b, err := m.MetadataCache.GetMeta(roleSpecifier, store.MaxSize) + b, err := m.MetadataCache.GetMeta(roleSpecifier, store.NoSizeLimit) if err != nil { return err } @@ -471,7 +471,7 @@ func (m *MetadataSwizzler) ChangeRootKey() error { return err } - b, err := m.MetadataCache.GetMeta(data.CanonicalRootRole, store.MaxSize) + b, err := m.MetadataCache.GetMeta(data.CanonicalRootRole, store.NoSizeLimit) if err != nil { return err } @@ -509,7 +509,7 @@ func (m *MetadataSwizzler) UpdateSnapshotHashes(roles ...string) error { snapshotSigned *data.Signed err error ) - if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.NoSizeLimit); err != nil { return err } @@ -525,7 +525,7 @@ func (m *MetadataSwizzler) UpdateSnapshotHashes(roles ...string) error { for _, role := range roles { if role != data.CanonicalSnapshotRole && role != data.CanonicalTimestampRole { - if metaBytes, err = m.MetadataCache.GetMeta(role, store.MaxSize); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(role, store.NoSizeLimit); err != nil { return err } @@ -561,7 +561,7 @@ func (m *MetadataSwizzler) UpdateTimestampHash() error { timestampSigned *data.Signed err error ) - if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.MaxSize); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.NoSizeLimit); err != nil { return err } // we can't just create a new timestamp, because then the expiry would be @@ -570,7 +570,7 @@ func (m *MetadataSwizzler) UpdateTimestampHash() error { return err } - if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize); err != nil { + if metaBytes, err = m.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.NoSizeLimit); err != nil { return err } diff --git a/tuf/testutils/swizzler_test.go b/tuf/testutils/swizzler_test.go index 4701be4f71..87f12b9619 100644 --- a/tuf/testutils/swizzler_test.go +++ b/tuf/testutils/swizzler_test.go @@ -80,7 +80,7 @@ func TestSwizzlerSetInvalidJSON(t *testing.T) { f.SetInvalidJSON(data.CanonicalSnapshotRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalSnapshotRole { @@ -105,7 +105,7 @@ func TestSwizzlerAddExtraSpace(t *testing.T) { require.NoError(t, json.Unmarshal(origMeta[data.CanonicalSnapshotRole], snapshot)) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -136,7 +136,7 @@ func TestSwizzlerSetInvalidSigned(t *testing.T) { f.SetInvalidSigned(data.CanonicalTargetsRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -161,7 +161,7 @@ func TestSwizzlerSetInvalidSignedMeta(t *testing.T) { require.NoError(t, err) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -185,7 +185,7 @@ func TestSwizzlerSetInvalidMetadataType(t *testing.T) { f.SetInvalidMetadataType(data.CanonicalTargetsRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -208,7 +208,7 @@ func TestSwizzlerInvalidateMetadataSignatures(t *testing.T) { f.InvalidateMetadataSignatures(data.CanonicalRootRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -240,7 +240,7 @@ func TestSwizzlerRemoveMetadata(t *testing.T) { f.RemoveMetadata("targets/a") for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) if role != "targets/a" { require.NoError(t, err) require.True(t, bytes.Equal(metaBytes, newMeta), "bytes have changed for role %s", role) @@ -258,7 +258,7 @@ func TestSwizzlerSignMetadataWithInvalidKey(t *testing.T) { f.SignMetadataWithInvalidKey(data.CanonicalTimestampRole) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalTimestampRole { @@ -285,7 +285,7 @@ func TestSwizzlerOffsetMetadataVersion(t *testing.T) { f.OffsetMetadataVersion("targets/a", -2) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != "targets/a" { @@ -309,7 +309,7 @@ func TestSwizzlerExpireMetadata(t *testing.T) { require.NoError(t, err) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -334,7 +334,7 @@ func TestSwizzlerSetThresholdBaseRole(t *testing.T) { require.NoError(t, err) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) // the threshold for base roles is set in root @@ -362,7 +362,7 @@ func TestSwizzlerSetThresholdDelegatedRole(t *testing.T) { f.SetThreshold("targets/a/b", 3) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) // the threshold for "targets/a/b" is in "targets/a" @@ -392,7 +392,7 @@ func TestSwizzlerChangeRootKey(t *testing.T) { for _, role := range roles { origMeta := origMeta[role] - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) // the threshold for base roles is set in root @@ -437,7 +437,7 @@ func TestSwizzlerUpdateSnapshotHashesSpecifiedRoles(t *testing.T) { // nothing has changed, signed data should be the same (signatures might // change because signatures may have random elements f.UpdateSnapshotHashes(data.CanonicalTargetsRole) - newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.NoSizeLimit) origSigned, newSigned := &data.Signed{}, &data.Signed{} require.NoError(t, json.Unmarshal(origMeta[data.CanonicalSnapshotRole], origSigned)) @@ -451,7 +451,7 @@ func TestSwizzlerUpdateSnapshotHashesSpecifiedRoles(t *testing.T) { // update the snapshot with just 1 role f.UpdateSnapshotHashes(data.CanonicalTargetsRole) - newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) + newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.NoSizeLimit) require.NoError(t, err) require.False(t, bytes.Equal(origMeta[data.CanonicalSnapshotRole], newMeta)) @@ -481,7 +481,7 @@ func TestSwizzlerUpdateSnapshotHashesNoSpecifiedRoles(t *testing.T) { // nothing has changed, signed data should be the same (signatures might // change because signatures may have random elements f.UpdateSnapshotHashes() - newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.NoSizeLimit) require.NoError(t, err) origSigned, newSigned := &data.Signed{}, &data.Signed{} @@ -496,7 +496,7 @@ func TestSwizzlerUpdateSnapshotHashesNoSpecifiedRoles(t *testing.T) { // update the snapshot with just no specified roles f.UpdateSnapshotHashes() - newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.MaxSize) + newMeta, err = f.MetadataCache.GetMeta(data.CanonicalSnapshotRole, store.NoSizeLimit) require.NoError(t, err) require.False(t, bytes.Equal(origMeta[data.CanonicalSnapshotRole], newMeta)) @@ -527,7 +527,7 @@ func TestSwizzlerUpdateTimestamp(t *testing.T) { // nothing has changed, signed data should be the same (signatures might // change because signatures may have random elements f.UpdateTimestampHash() - newMeta, err := f.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.NoSizeLimit) require.NoError(t, err) origSigned, newSigned := &data.Signed{}, &data.Signed{} @@ -540,7 +540,7 @@ func TestSwizzlerUpdateTimestamp(t *testing.T) { // update the timestamp f.UpdateTimestampHash() - newMeta, err = f.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.MaxSize) + newMeta, err = f.MetadataCache.GetMeta(data.CanonicalTimestampRole, store.NoSizeLimit) require.NoError(t, err) require.False(t, bytes.Equal(origMeta[data.CanonicalTimestampRole], newMeta)) @@ -584,7 +584,7 @@ func TestSwizzlerMutateRoot(t *testing.T) { require.NoError(t, f.MutateRoot(func(r *data.Root) { r.Roles["hello"] = nil })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -610,7 +610,7 @@ func TestSwizzlerMutateTimestamp(t *testing.T) { require.NoError(t, f.MutateTimestamp(func(t *data.Timestamp) { t.Meta["hello"] = data.FileMeta{} })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalTimestampRole { @@ -633,7 +633,7 @@ func TestSwizzlerMutateSnapshot(t *testing.T) { require.NoError(t, f.MutateSnapshot(func(s *data.Snapshot) { s.Meta["hello"] = data.FileMeta{} })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalSnapshotRole { @@ -656,7 +656,7 @@ func TestSwizzlerMutateTargets(t *testing.T) { require.NoError(t, f.MutateTargets(func(t *data.Targets) { t.Targets["hello"] = data.FileMeta{} })) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalTargetsRole { @@ -684,7 +684,7 @@ func TestSwizzlerRotateKeyBaseRole(t *testing.T) { require.NoError(t, f.RotateKey(theRole, pubKey)) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != data.CanonicalRootRole { @@ -716,7 +716,7 @@ func TestSwizzlerRotateKeyDelegationRole(t *testing.T) { require.NoError(t, f.RotateKey(theRole, pubKey)) for role, metaBytes := range origMeta { - newMeta, err := f.MetadataCache.GetMeta(role, store.MaxSize) + newMeta, err := f.MetadataCache.GetMeta(role, store.NoSizeLimit) require.NoError(t, err) if role != "targets/a" {