rebase and update test cases to long expiration (10 years from now), by default.

Author: hosseinsia

client/client.go

@@ -7,17 +7,6 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-	"sort"
-=======
->>>>>>> 2fc418a (addressed several comments.)
-	"time"
->>>>>>> 78b1631 (test for fast forward attack recovery)
-=======
->>>>>>> 5326b91 (fix race condition related to the expired check.)
 
 	"github.com/theupdateframework/go-tuf/data"
 	"github.com/theupdateframework/go-tuf/util"
@@ -247,31 +236,12 @@ func (c *Client) updateRoots() error {
 
 	// Prepare for 5.3.11: If the timestamp and / or snapshot keys have been rotated,
 	// then delete the trusted timestamp and snapshot metadata files.
-<<<<<<< HEAD
-<<<<<<< HEAD
 	getKeyInfo := func(role string) KeyInfo {
 		keyIDs := make(map[string]bool)
-=======
-	getKeyIDs := func(role string) ([]string, int) {
-		keyIDs := make([]string, 0, len(c.db.GetRole(role).KeyIDs))
->>>>>>> 78b1631 (test for fast forward attack recovery)
 		for k := range c.db.GetRole(role).KeyIDs {
 			keyIDs[k] = true
 		}
-<<<<<<< HEAD
 		return KeyInfo{keyIDs, c.db.GetRole(role).Threshold}
-=======
-		sort.Strings(keyIDs)
-		return keyIDs, c.db.GetRole(role).Threshold
->>>>>>> 78b1631 (test for fast forward attack recovery)
-=======
-	getKeyInfo := func(role string) KeyInfo {
-		keyIDs := make(map[string]bool)
-		for k := range c.db.GetRole(role).KeyIDs {
-			keyIDs[k] = true
-		}
-		return KeyInfo{keyIDs, c.db.GetRole(role).Threshold}
->>>>>>> 2fc418a (addressed several comments.)
 	}
 
 	// The nonRootKeyInfo looks like this:
@@ -280,24 +250,10 @@ func (c *Client) updateRoots() error {
 	//	"snapshot": {KeyIDs={"KEYID3": true}, Threshold=1},
 	//	"targets": {KeyIDs={"KEYID4": true, "KEYID5": true, "KEYID6": true}, Threshold=1}
 	// }
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-	nonRootKeyInfo := map[string]KeyInfo{"timestamp": {}, "snapshot": {}, "targets": {}}
-	for k := range nonRootKeyInfo {
-		nonRootKeyInfo[k] = getKeyInfo(k)
-=======
-	nonRootManifests := map[string][]string{"timestamp": {}, "snapshot": {}, "targets": {}}
-	nonRootThreshold := map[string]int{"timestamp": 1, "snapshot": 1, "targets": 1}
-	for k := range nonRootManifests {
-		nonRootManifests[k], nonRootThreshold[k] = getKeyIDs(k)
->>>>>>> 78b1631 (test for fast forward attack recovery)
-=======
 
 	nonRootKeyInfo := map[string]KeyInfo{"timestamp": {}, "snapshot": {}, "targets": {}}
 	for k := range nonRootKeyInfo {
 		nonRootKeyInfo[k] = getKeyInfo(k)
->>>>>>> 2fc418a (addressed several comments.)
 	}
 
 	// 5.3.1 Temorarily turn on the consistent snapshots in order to download
@@ -379,32 +335,11 @@ func (c *Client) updateRoots() error {
 		return err
 	}
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 2fc418a (addressed several comments.)
 	countDeleted := func(s1 map[string]bool, s2 map[string]bool) int {
 		c := 0
 		for k := range s1 {
 			if _, ok := s2[k]; !ok {
 				c++
-<<<<<<< HEAD
-=======
-	countDeleted := func(s1 []string, s2 []string) int {
-		c := len(s1)
-		p2 := 0
-		for _, v := range s1 {
-			for p2 < len(s2) && v >= s2[p2] {
-				if v == s2[p2] {
-					c--
-					p2++
-					break
-				}
-				p2++
->>>>>>> 78b1631 (test for fast forward attack recovery)
-=======
->>>>>>> 2fc418a (addressed several comments.)
 			}
 		}
 		return c
@@ -414,8 +349,6 @@ func (c *Client) updateRoots() error {
 	// to be deleted if a threshold of keys are revoked.
 	// List of metadata that should be deleted per role if a threshold of keys
 	// are revoked:
-<<<<<<< HEAD
-<<<<<<< HEAD
 	// (based on the ongoing PR: https://github.com/mnm678/specification/tree/e50151d9df632299ddea364c4f44fe8ca9c10184)
 	// timestamp -> delete timestamp.json
 	// snapshot ->  delete timestamp.json and snapshot.json
@@ -436,35 +369,6 @@ func (c *Client) updateRoots() error {
 			for _, r := range deleteMeta[topLevelRolename] {
 				c.local.DeleteMeta(r)
 			}
-=======
-	// 5.3.11 If the timestamp and / or snapshot keys have been rotated,
-	// then delete the trusted timestamp and snapshot metadata files.
-	for topLevelRolename := range nonRootManifests {
-		if !reflect.DeepEqual(
-			nonRootManifests[topLevelRolename],
-			getKeyIDs(topLevelRolename)) {
-			c.local.DeleteMeta(topLevelRolename)
->>>>>>> 6a1b949 (delete (instead of setting to an empty raw message) the top-level metadata when their key has changed.)
-=======
-=======
-	// (based on the ongoing PR: https://github.com/mnm678/specification/tree/e50151d9df632299ddea364c4f44fe8ca9c10184)
->>>>>>> 2fc418a (addressed several comments.)
-	// timestamp -> delete timestamp.json
-	// snapshot ->  delete timestamp.json and snapshot.json
-	// targets ->   delete snapshot.json and targets.json
-	for topLevelRolename := range nonRootKeyInfo {
-		ki := getKeyInfo(topLevelRolename)
-		if countDeleted(nonRootKeyInfo[topLevelRolename].KeyIDs, ki.KeyIDs) >= nonRootKeyInfo[topLevelRolename].Threshold {
-			deleteMeta := map[string][]string{
-				"timestamp": {"timestamp.json"},
-				"snapshot":  {"timestamp.json", "snapshot.json"},
-				"targets":   {"snapshot.json", "targets.json"},
-			}
-
-			for _, r := range deleteMeta[topLevelRolename] {
-				c.local.DeleteMeta(r)
-			}
->>>>>>> 78b1631 (test for fast forward attack recovery)
 		}
 	}
 
@@ -560,15 +464,7 @@ func (c *Client) loadAndVerifyLocalRootMeta(ignoreExpiredCheck bool) error {
 	}
 	// Any trusted local root metadata version must be greater than 0.
 	if ignoreExpiredCheck {
-<<<<<<< HEAD
-<<<<<<< HEAD
-		if err := ndb.VerifyIgnoreExpiredCheck(s, "root", 0); err != nil {
-=======
-		if _, err := ndb.VerifyIgnoreExpiredCheck(s, "root", 0); err != nil {
->>>>>>> 5326b91 (fix race condition related to the expired check.)
-=======
 		if err := ndb.VerifyIgnoreExpiredCheck(s, "root", 0); err != nil {
->>>>>>> c55d799 (update the VerifyIgnoreExpiredCheck method signature and add test for it.)
 			return err
 		}
 	} else {