Skip to content

Commit

Permalink
Remove namespaces table and more descriptive naming
Browse files Browse the repository at this point in the history 
Signed-off-by: Evan Cordell <cordell.evan@gmail.com>
  • Loading branch information
@ecordell
ecordell committed Mar 3, 2017
1 parent 01724ad commit a95d5fa
Show file tree
Hide file tree
Showing 20 changed files with 158 additions and 172 deletions.
8 changes: 4 additions & 4 deletions cmd/notary/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,14 @@ type recordingMetaStore struct {
// that the metadata was requested
func (r *recordingMetaStore) GetCurrent(gun data.GUN, namespace storage.Namespace, role data.RoleName) (*time.Time, []byte, error) {
r.gotten = append(r.gotten, fmt.Sprintf("%s.%s.%s", gun.String(), role.String(), namespace.String()))
return r.MemStorage.GetCurrent(gun, storage.DefaultNamespace, role)
return r.MemStorage.GetCurrent(gun, storage.PublishedState, role)
}

// GetChecksum gets the metadata from the underlying MetaStore, but also records
// that the metadata was requested
func (r *recordingMetaStore) GetChecksum(gun data.GUN, namepsace storage.Namespace, role data.RoleName, checksum string) (*time.Time, []byte, error) {
r.gotten = append(r.gotten, fmt.Sprintf("%s.%s.%s", gun.String(), role.String(), namepsace.String()))
return r.MemStorage.GetChecksum(gun, storage.DefaultNamespace, role, checksum)
return r.MemStorage.GetChecksum(gun, storage.PublishedState, role, checksum)
}

// the config can provide all the TLS information necessary - the root ca file,
Expand Down Expand Up @@ -368,7 +368,7 @@ func TestConfigFileTLSCanBeRelativeToConfigOrAbsolute(t *testing.T) {

// validate that we actually managed to connect and attempted to download the root though
require.Len(t, m.gotten, 1)
require.Equal(t, m.gotten[0], "repo.root.default")
require.Equal(t, m.gotten[0], "repo.root.published")
}

// Whatever TLS config is in the config file can be overridden by the command line
Expand Down Expand Up @@ -418,7 +418,7 @@ func TestConfigFileOverridenByCmdLineFlags(t *testing.T) {

// validate that we actually managed to connect and attempted to download the root though
require.Len(t, m.gotten, 1)
require.Equal(t, m.gotten[0], "repo.root.default")
require.Equal(t, m.gotten[0], "repo.root.published")
}

// the config can specify trust pinning settings for TOFUs, as well as pinned Certs or CA
Expand Down
13 changes: 2 additions & 11 deletions migrations/server/mysql/0006_namespaces.up.sql
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
CREATE TABLE `namespaces` (
`name` VARCHAR(255) NOT NULL,
PRIMARY KEY (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

INSERT INTO `namespaces` VALUES ("default");

ALTER TABLE `tuf_files`
ADD COLUMN `namespace` VARCHAR(255) DEFAULT "default",
ADD FOREIGN KEY (`namespace`) REFERENCES `namespaces`(`name`),
ADD COLUMN `namespace` VARCHAR(255) DEFAULT "published",
DROP INDEX `gun`,
ADD UNIQUE KEY `gun` (`gun`,`role`,`version`, `namespace`);

ALTER TABLE `changefeed`
ADD COLUMN `namespace` VARCHAR(255) DEFAULT "default",
ADD FOREIGN KEY (`namespace`) REFERENCES `namespaces`(`name`),
ADD COLUMN `namespace` VARCHAR(255) DEFAULT "published",
DROP INDEX `idx_changefeed_gun`,
ADD INDEX `idx_changefeed_gun` (`gun`, `namespace`);
9 changes: 2 additions & 7 deletions migrations/server/postgresql/0003_namespaces.up.sql
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
CREATE TABLE "namespaces" (
"name" VARCHAR(255) NOT NULL PRIMARY KEY
);
INSERT INTO namespaces (name) VALUES ('default');

ALTER TABLE "tuf_files"
ADD COLUMN "namespace" VARCHAR(255) NOT NULL DEFAULT ('default') REFERENCES "namespaces"("name"),
ADD COLUMN "namespace" VARCHAR(255) NOT NULL DEFAULT ('published'),
DROP CONSTRAINT "tuf_files_gun_role_version_key",
ADD UNIQUE ("gun","role","version", "namespace");


ALTER TABLE "changefeed"
ADD COLUMN "namespace" VARCHAR(255) NOT NULL DEFAULT ('default') REFERENCES "namespaces"("name");
ADD COLUMN "namespace" VARCHAR(255) NOT NULL DEFAULT ('published');

DROP INDEX "idx_changefeed_gun";
CREATE INDEX "idx_changefeed_gun_ns" ON "changefeed" ("gun", "namespace");
4 changes: 2 additions & 2 deletions server/handlers/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func atomicUpdateHandler(ctx context.Context, w http.ResponseWriter, r *http.Req
}
return errors.ErrInvalidUpdate.WithDetail(serializable)
}
err = store.UpdateMany(gun, storage.DefaultNamespace, updates)
err = store.UpdateMany(gun, storage.PublishedState, updates)
if err != nil {
// If we have an old version error, surface to user with error code
if _, ok := err.(storage.ErrOldVersion); ok {
Expand Down Expand Up @@ -169,7 +169,7 @@ func DeleteHandler(ctx context.Context, w http.ResponseWriter, r *http.Request)
logger.Error("500 DELETE repository: no storage exists")
return errors.ErrNoStorage.WithDetail(nil)
}
err := store.Delete(gun, storage.DefaultNamespace)
err := store.Delete(gun, storage.PublishedState)
if err != nil {
logger.Error("500 DELETE repository")
return errors.ErrUnknown.WithDetail(err)
Expand Down
12 changes: 6 additions & 6 deletions server/handlers/default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func TestGetHandlerRoot(t *testing.T) {
require.NoError(t, err)
rootJSON, err := json.Marshal(root)
require.NoError(t, err)
metaStore.UpdateCurrent("gun", storage.DefaultNamespace, storage.MetaUpdate{Role: "root", Version: 1, Data: rootJSON})
metaStore.UpdateCurrent("gun", storage.PublishedState, storage.MetaUpdate{Role: "root", Version: 1, Data: rootJSON})

req := &http.Request{
Body: ioutil.NopCloser(bytes.NewBuffer(nil)),
Expand Down Expand Up @@ -261,14 +261,14 @@ func TestGetHandlerTimestamp(t *testing.T) {
snJSON, err := json.Marshal(sn)
require.NoError(t, err)
metaStore.UpdateCurrent(
"gun", storage.DefaultNamespace, storage.MetaUpdate{Role: "snapshot", Version: 1, Data: snJSON})
"gun", storage.PublishedState, storage.MetaUpdate{Role: "snapshot", Version: 1, Data: snJSON})

ts, err := repo.SignTimestamp(data.DefaultExpires("timestamp"))
require.NoError(t, err)
tsJSON, err := json.Marshal(ts)
require.NoError(t, err)
metaStore.UpdateCurrent(
"gun", storage.DefaultNamespace, storage.MetaUpdate{Role: "timestamp", Version: 1, Data: tsJSON})
"gun", storage.PublishedState, storage.MetaUpdate{Role: "timestamp", Version: 1, Data: tsJSON})

req := &http.Request{
Body: ioutil.NopCloser(bytes.NewBuffer(nil)),
Expand Down Expand Up @@ -298,14 +298,14 @@ func TestGetHandlerSnapshot(t *testing.T) {
snJSON, err := json.Marshal(sn)
require.NoError(t, err)
metaStore.UpdateCurrent(
"gun", storage.DefaultNamespace, storage.MetaUpdate{Role: "snapshot", Version: 1, Data: snJSON})
"gun", storage.PublishedState, storage.MetaUpdate{Role: "snapshot", Version: 1, Data: snJSON})

ts, err := repo.SignTimestamp(data.DefaultExpires("timestamp"))
require.NoError(t, err)
tsJSON, err := json.Marshal(ts)
require.NoError(t, err)
metaStore.UpdateCurrent(
"gun", storage.DefaultNamespace, storage.MetaUpdate{Role: "timestamp", Version: 1, Data: tsJSON})
"gun", storage.PublishedState, storage.MetaUpdate{Role: "timestamp", Version: 1, Data: tsJSON})

req := &http.Request{
Body: ioutil.NopCloser(bytes.NewBuffer(nil)),
Expand Down Expand Up @@ -345,7 +345,7 @@ func TestGetHandler404(t *testing.T) {

func TestGetHandlerNilData(t *testing.T) {
metaStore := storage.NewMemStorage()
metaStore.UpdateCurrent("gun", storage.DefaultNamespace, storage.MetaUpdate{Role: "root", Version: 1, Data: nil})
metaStore.UpdateCurrent("gun", storage.PublishedState, storage.MetaUpdate{Role: "root", Version: 1, Data: nil})

ctx := context.Background()
ctx = context.WithValue(ctx, notary.CtxKeyMetaStore, metaStore)
Expand Down
8 changes: 4 additions & 4 deletions server/handlers/roles.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ func getRole(ctx context.Context, store storage.MetaStore, gun data.GUN, role da
err error
)
if checksum != "" {
lastModified, out, err = store.GetChecksum(gun, storage.DefaultNamespace, role, checksum)
lastModified, out, err = store.GetChecksum(gun, storage.PublishedState, role, checksum)
} else if version != "" {
v, vErr := strconv.Atoi(version)
if vErr != nil {
return nil, nil, errors.ErrMetadataNotFound.WithDetail(vErr)
}
lastModified, out, err = store.GetVersion(gun, storage.DefaultNamespace, role, v)
lastModified, out, err = store.GetVersion(gun, storage.PublishedState, role, v)
} else {
// the timestamp and snapshot might be server signed so are
// handled specially
switch role {
case data.CanonicalTimestampRole, data.CanonicalSnapshotRole:
return getMaybeServerSigned(ctx, store, gun, role)
}
lastModified, out, err = store.GetCurrent(gun, storage.DefaultNamespace, role)
lastModified, out, err = store.GetCurrent(gun, storage.PublishedState, role)

}

Expand Down Expand Up @@ -98,7 +98,7 @@ func getMaybeServerSigned(ctx context.Context, store storage.MetaStore, gun data
}
if snapshotSHA256Bytes, ok := snapshotChecksums.Hashes[notary.SHA256]; ok {
snapshotSHA256Hex := hex.EncodeToString(snapshotSHA256Bytes[:])
return store.GetChecksum(gun, storage.DefaultNamespace, role, snapshotSHA256Hex)
return store.GetChecksum(gun, storage.PublishedState, role, snapshotSHA256Hex)
}
return nil, nil, fmt.Errorf("could not retrieve sha256 snapshot checksum")
}
Expand Down
6 changes: 3 additions & 3 deletions server/handlers/validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func loadAndValidateTargets(gun data.GUN, builder tuf.RepoBuilder, roles map[dat
// snapshot on the repo as well
func generateSnapshot(gun data.GUN, builder tuf.RepoBuilder, store storage.MetaStore) (*storage.MetaUpdate, error) {
var prev *data.SignedSnapshot
_, currentJSON, err := store.GetCurrent(gun, storage.DefaultNamespace, data.CanonicalSnapshotRole)
_, currentJSON, err := store.GetCurrent(gun, storage.PublishedState, data.CanonicalSnapshotRole)
if err == nil {
prev = new(data.SignedSnapshot)
if err = json.Unmarshal(currentJSON, prev); err != nil {
Expand Down Expand Up @@ -188,7 +188,7 @@ func generateSnapshot(gun data.GUN, builder tuf.RepoBuilder, store storage.MetaS
// the other roles have already been set on the repo, and will set the generated timestamp on the repo as well
func generateTimestamp(gun data.GUN, builder tuf.RepoBuilder, store storage.MetaStore) (*storage.MetaUpdate, error) {
var prev *data.SignedTimestamp
_, currentJSON, err := store.GetCurrent(gun, storage.DefaultNamespace, data.CanonicalTimestampRole)
_, currentJSON, err := store.GetCurrent(gun, storage.PublishedState, data.CanonicalTimestampRole)

switch err.(type) {
case nil:
Expand Down Expand Up @@ -224,7 +224,7 @@ func generateTimestamp(gun data.GUN, builder tuf.RepoBuilder, store storage.Meta
}

func loadFromStore(gun data.GUN, roleName data.RoleName, builder tuf.RepoBuilder, store storage.MetaStore) error {
_, metaJSON, err := store.GetCurrent(gun, storage.DefaultNamespace, roleName)
_, metaJSON, err := store.GetCurrent(gun, storage.PublishedState, roleName)
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit a95d5fa

Please sign in to comment.