Storage cleanup

server/storage/memory.go

@@ -384,5 +384,5 @@ func entryKey(gun data.GUN, role data.RoleName, channel *Channel) string {
 }
 
 func checksumKey(gun data.GUN) string {
-	return fmt.Sprintf("%s", gun)
+	return gun.String()
 }

server/storage/sql_models.go

@@ -31,17 +31,19 @@ func (c Channel) TableName() string {
 	return ChannelTableName
 }
 
-// Published is the channel all fully signed, validated metadata lives in
-var Published = Channel{
-	ID:   1,
-	Name: "published",
-}
+var (
+	// Published is the channel all fully signed, validated metadata lives in
+	Published = Channel{
+		ID:   1,
+		Name: "published",
+	}
 
-// Staged is the channel all partially signed metadata lives in
-var Staged = Channel{
-	ID:   2,
-	Name: "staged",
-}
+	// Staged is the channel all partially signed metadata lives in
+	Staged = Channel{
+		ID:   2,
+		Name: "staged",
+	}
+)
 
 // TUFFile represents a TUF file in the database
 type TUFFile struct {

tuf/data/targets.go

@@ -3,6 +3,7 @@ package data
 import (
 	"errors"
 	"fmt"
+	"path"
 
 	"github.com/docker/go/canonical/json"
 )
@@ -42,7 +43,7 @@ func isValidTargetsStructure(t Targets, roleName RoleName) error {
 	}
 
 	for _, roleObj := range t.Delegations.Roles {
-		if !IsDelegation(roleObj.Name) {
+		if !IsDelegation(roleObj.Name) || path.Dir(roleObj.Name.String()) != roleName.String() {
 			return ErrInvalidMetadata{
 				role: roleName, msg: fmt.Sprintf("delegation role %s invalid", roleObj.Name)}
 		}