docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

When downloading snapshot, return ErrNotLoaded if timestamp hasn't been loaded. Similarly for targets. 

Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
Ying Li 2016-02-16 11:44:40 -08:00
parent 57e28e4f09
commit d8938f76e7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tuf/client/client.go
View File

@ -318,7 +318,7 @@ func (c *Client) downloadSnapshot() error {
logrus.Debug("Downloading Snapshot...") logrus.Debug("Downloading Snapshot...")
role := data.CanonicalSnapshotRole role := data.CanonicalSnapshotRole
if c.local.Timestamp == nil { if c.local.Timestamp == nil {
return data.ErrMissingMeta{Role: "snapshot"} return tuf.ErrNotLoaded{Role: data.CanonicalTimestampRole}
} }
size := c.local.Timestamp.Signed.Meta[role].Length size := c.local.Timestamp.Signed.Meta[role].Length
expectedSha256, ok := c.local.Timestamp.Signed.Meta[role].Hashes["sha256"] expectedSha256, ok := c.local.Timestamp.Signed.Meta[role].Hashes["sha256"]
@ -402,7 +402,7 @@ func (c *Client) downloadTargets(role string) error {
return err return err
} }
if c.local.Snapshot == nil { if c.local.Snapshot == nil {
return data.ErrMissingMeta{Role: role} return tuf.ErrNotLoaded{Role: data.CanonicalSnapshotRole}
} }
snap := c.local.Snapshot.Signed snap := c.local.Snapshot.Signed
root := c.local.Root.Signed root := c.local.Root.Signed

4
tuf/client/client_test.go
View File

@ -536,7 +536,7 @@ func TestDownloadTargetsNoSnapshot(t *testing.T) {
repo.Snapshot = nil repo.Snapshot = nil
err = client.downloadTargets("targets") err = client.downloadTargets("targets")
assert.IsType(t, data.ErrMissingMeta{}, err) assert.IsType(t, tuf.ErrNotLoaded{}, err)
} }
func TestBootstrapDownloadRootHappy(t *testing.T) { func TestBootstrapDownloadRootHappy(t *testing.T) {
@ -740,7 +740,7 @@ func TestDownloadSnapshotNoTimestamp(t *testing.T) {
repo.Timestamp = nil repo.Timestamp = nil
err = client.downloadSnapshot() err = client.downloadSnapshot()
assert.IsType(t, data.ErrMissingMeta{}, err) assert.IsType(t, tuf.ErrNotLoaded{}, err)
} }
func TestDownloadSnapshotNoChecksum(t *testing.T) { func TestDownloadSnapshotNoChecksum(t *testing.T) {

12
tuf/tuf.go
View File

@ -40,11 +40,11 @@ func (e ErrLocalRootExpired) Error() string {
// the repo. This means specifically that the relevant JSON file has not // the repo. This means specifically that the relevant JSON file has not
// been loaded. // been loaded.
type ErrNotLoaded struct { type ErrNotLoaded struct {
role string Role string
} }
func (err ErrNotLoaded) Error() string { func (err ErrNotLoaded) Error() string {
return fmt.Sprintf("%s role has not been loaded", err.role) return fmt.Sprintf("%s role has not been loaded", err.Role)
} }
// Repo is an in memory representation of the TUF Repo. // Repo is an in memory representation of the TUF Repo.
@ -74,7 +74,7 @@ func NewRepo(cryptoService signed.CryptoService) *Repo {
// AddBaseKeys is used to add keys to the role in root.json // AddBaseKeys is used to add keys to the role in root.json
func (tr *Repo) AddBaseKeys(role string, keys ...data.PublicKey) error { func (tr *Repo) AddBaseKeys(role string, keys ...data.PublicKey) error {
if tr.Root == nil { if tr.Root == nil {
return ErrNotLoaded{role: "root"} return ErrNotLoaded{Role: data.CanonicalRootRole}
} }
ids := []string{} ids := []string{}
for _, k := range keys { for _, k := range keys {
@ -120,7 +120,7 @@ func (tr *Repo) ReplaceBaseKeys(role string, keys ...data.PublicKey) error {
// RemoveBaseKeys is used to remove keys from the roles in root.json // RemoveBaseKeys is used to remove keys from the roles in root.json
func (tr *Repo) RemoveBaseKeys(role string, keyIDs ...string) error { func (tr *Repo) RemoveBaseKeys(role string, keyIDs ...string) error {
if tr.Root == nil { if tr.Root == nil {
return ErrNotLoaded{role: "root"} return ErrNotLoaded{Role: data.CanonicalRootRole}
} }
var keep []string var keep []string
toDelete := make(map[string]struct{}) toDelete := make(map[string]struct{})
@ -468,7 +468,7 @@ func (tr *Repo) InitTargets(role string) (*data.SignedTargets, error) {
// InitSnapshot initializes a snapshot based on the current root and targets // InitSnapshot initializes a snapshot based on the current root and targets
func (tr *Repo) InitSnapshot() error { func (tr *Repo) InitSnapshot() error {
if tr.Root == nil { if tr.Root == nil {
return ErrNotLoaded{role: "root"} return ErrNotLoaded{Role: data.CanonicalRootRole}
} }
root, err := tr.Root.ToSigned() root, err := tr.Root.ToSigned()
if err != nil { if err != nil {
@ -476,7 +476,7 @@ func (tr *Repo) InitSnapshot() error {
} }
if _, ok := tr.Targets[data.CanonicalTargetsRole]; !ok { if _, ok := tr.Targets[data.CanonicalTargetsRole]; !ok {
return ErrNotLoaded{role: "targets"} return ErrNotLoaded{Role: data.CanonicalTargetsRole}
} }
targets, err := tr.Targets[data.CanonicalTargetsRole].ToSigned() targets, err := tr.Targets[data.CanonicalTargetsRole].ToSigned()
if err != nil { if err != nil {