Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow commit without adding targets #238

Merged
merged 1 commit into from
Mar 23, 2022
Merged

Allow commit without adding targets #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,14 @@ func (r *Repo) Init(consistentSnapshot bool) error {
root.ConsistentSnapshot = consistentSnapshot
// Set root version to 1 for a new root.
root.Version = 1
err = r.setTopLevelMeta("root.json", root)
if err == nil {
fmt.Println("Repository initialized")
if err = r.setTopLevelMeta("root.json", root); err != nil {
return err
}
return err
if err = r.writeTargetWithExpires(t, data.DefaultExpires("targets")); err != nil {
return err
}
fmt.Println("Repository initialized")
return nil
}

func (r *Repo) topLevelKeysDB() (*verify.DB, error) {
Expand Down Expand Up @@ -776,7 +779,7 @@ func (r *Repo) writeTargetWithExpires(t *data.Targets, expires time.Time) error
}

err := r.setTopLevelMeta("targets.json", t)
if err == nil {
if err == nil && len(t.Targets) > 0 {
fmt.Println("Added/staged targets:")
for k := range t.Targets {
fmt.Println("*", k)
Expand Down
12 changes: 7 additions & 5 deletions repo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,13 +687,15 @@ func (rs *RepoSuite) TestCommit(c *C) {
// commit without root.json
c.Assert(r.Commit(), DeepEquals, ErrMissingMetadata{"root.json"})

// commit without targets.json
// Init should create targets.json, but not signed yet
r.Init(false)
c.Assert(r.Commit(), DeepEquals, ErrMissingMetadata{"snapshot.json"})

genKey(c, r, "root")
c.Assert(r.Commit(), DeepEquals, ErrMissingMetadata{"targets.json"})

// commit without snapshot.json
genKey(c, r, "targets")
c.Assert(r.AddTarget("foo.txt", nil), IsNil)
c.Assert(r.Sign("targets.json"), IsNil)
c.Assert(r.Commit(), DeepEquals, ErrMissingMetadata{"snapshot.json"})

// commit without timestamp.json
Expand All @@ -714,12 +716,12 @@ func (rs *RepoSuite) TestCommit(c *C) {
// commit with an invalid root hash in snapshot.json due to new key creation
genKey(c, r, "targets")
c.Assert(r.Sign("targets.json"), IsNil)
c.Assert(r.Commit(), DeepEquals, errors.New("tuf: invalid targets.json in snapshot.json: wrong length, expected 511 got 725"))
c.Assert(r.Commit(), DeepEquals, errors.New("tuf: invalid targets.json in snapshot.json: wrong length, expected 338 got 552"))

// commit with an invalid targets hash in snapshot.json
c.Assert(r.Snapshot(), IsNil)
c.Assert(r.AddTarget("bar.txt", nil), IsNil)
c.Assert(r.Commit(), DeepEquals, errors.New("tuf: invalid targets.json in snapshot.json: wrong length, expected 725 got 899"))
c.Assert(r.Commit(), DeepEquals, errors.New("tuf: invalid targets.json in snapshot.json: wrong length, expected 552 got 725"))

// commit with an invalid timestamp
c.Assert(r.Snapshot(), IsNil)
Expand Down