Skip to content

Commit 36977d7

Browse files
hosseinsiahosseinsia
committed
add test for root update for client version above 1.
1 parent d26a937 commit 36977d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2597
-0
lines changed

‎client/client_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,8 @@ func (s *ClientSuite) TestUpdateRoots(c *C) {
419419
{"testdata/PublishedTwice", false, nil, map[string]int{"root": 2, "timestamp": 1, "snapshot": 1, "targets": 1}},
420420
// New root update (root role key rotation) succeeds.
421421
{"testdata/PublishedTwiceWithRotatedKeys_root", false, nil, map[string]int{"root": 2, "timestamp": 1, "snapshot": 1, "targets": 1}},
422+
// New root update for versions above 1 (root role key rotation) succeeds.
423+
{"testdata/Published5TimesWithRotatedKeys_root", false, nil, map[string]int{"root": 5, "timestamp": 1, "snapshot": 1, "targets": 1}},
422424
// New root update (snapshot role key rotation) succeeds.
423425
{"testdata/PublishedTwiceWithRotatedKeys_snapshot", false, nil, map[string]int{"root": 2, "timestamp": 2, "snapshot": 2, "targets": 1}},
424426
// New root update (targets role key rotation) succeeds.

‎client/testdata/Published5TimesWithRotatedKeys_root/client/metadata/current/1.root.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"signatures": [
3+
{
4+
"keyid": "d4dab4b4d68b91665a6d0dac5b4e64677aa6d853fc787669168b4b4ba9822129",
5+
"sig": "d0bf76a5cfc0aee1b8a1b1bf0ed8ca646a1a6d5f205945c515e8546bfd3c1e6b5e07cc0b93836bd030dd05ba68f177aecb05f6bf90c6702fd178e53310022506"
6+
}
7+
],
8+
"signed": {
9+
"_type": "root",
10+
"consistent_snapshot": true,
11+
"expires": "2020-12-31T05:48:20Z",
12+
"keys": {
13+
"3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae": {
14+
"keyid_hash_algorithms": [
15+
"sha256",
16+
"sha512"
17+
],
18+
"keytype": "ed25519",
19+
"keyval": {
20+
"public": "6bac59b8d9e1aae02fae6fba6e7fe3fc9fe5b4a9fe98c3fca255d8c8ec3e5b35"
21+
},
22+
"scheme": "ed25519"
23+
},
24+
"77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93": {
25+
"keyid_hash_algorithms": [
26+
"sha256",
27+
"sha512"
28+
],
29+
"keytype": "ed25519",
30+
"keyval": {
31+
"public": "6400d770c7c1bce4b3d59ce0079ed686e843b6500bbea77d869a1ae7df4565a1"
32+
},
33+
"scheme": "ed25519"
34+
},
35+
"d4dab4b4d68b91665a6d0dac5b4e64677aa6d853fc787669168b4b4ba9822129": {
36+
"keyid_hash_algorithms": [
37+
"sha256",
38+
"sha512"
39+
],
40+
"keytype": "ed25519",
41+
"keyval": {
42+
"public": "28bf74baa87ed923f8fa27e3292684f8ec4730ce0bdc65150ed58199206ce089"
43+
},
44+
"scheme": "ed25519"
45+
},
46+
"e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4": {
47+
"keyid_hash_algorithms": [
48+
"sha256",
49+
"sha512"
50+
],
51+
"keytype": "ed25519",
52+
"keyval": {
53+
"public": "e6ae9d3b67d7b3ce274130291dd90287f32b8fd72bfb4ac5430859ebd1c28a46"
54+
},
55+
"scheme": "ed25519"
56+
}
57+
},
58+
"roles": {
59+
"root": {
60+
"keyids": [
61+
"d4dab4b4d68b91665a6d0dac5b4e64677aa6d853fc787669168b4b4ba9822129"
62+
],
63+
"threshold": 1
64+
},
65+
"snapshot": {
66+
"keyids": [
67+
"77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93"
68+
],
69+
"threshold": 1
70+
},
71+
"targets": {
72+
"keyids": [
73+
"e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4"
74+
],
75+
"threshold": 1
76+
},
77+
"timestamp": {
78+
"keyids": [
79+
"3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae"
80+
],
81+
"threshold": 1
82+
}
83+
},
84+
"spec_version": "1.0.0",
85+
"version": 1
86+
}
87+
}

‎client/testdata/Published5TimesWithRotatedKeys_root/client/metadata/current/1.snapshot.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"signatures": [
3+
{
4+
"keyid": "77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93",
5+
"sig": "61db8765350398f7f750853337d9a55c5d6e790812d29146b5b45d5fd43d2a42c474a7a9fab263c3a50a28114a82f79dbf24ff1f99ae737a8d06f332f9f7d103"
6+
}
7+
],
8+
"signed": {
9+
"_type": "snapshot",
10+
"expires": "2020-01-08T00:00:00Z",
11+
"meta": {
12+
"targets.json": {
13+
"version": 1
14+
}
15+
},
16+
"spec_version": "1.0.0",
17+
"version": 1
18+
}
19+
}

‎client/testdata/Published5TimesWithRotatedKeys_root/client/metadata/current/1.targets.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"signatures": [
3+
{
4+
"keyid": "e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4",
5+
"sig": "c150e8ed5d352f366a979f4c4b9d556350c414c2da7ef1279045aaed3438c60872142d0dfe5ddbb627fec2d8fb7c5d8e692e04a87230b78d74714c5db035620a"
6+
}
7+
],
8+
"signed": {
9+
"_type": "targets",
10+
"delegations": {
11+
"keys": {},
12+
"roles": []
13+
},
14+
"expires": "2020-04-01T07:27:10Z",
15+
"spec_version": "1.0.0",
16+
"targets": {},
17+
"version": 1
18+
}
19+
}

‎client/testdata/Published5TimesWithRotatedKeys_root/client/metadata/current/1.timestamp.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"signatures": [
3+
{
4+
"keyid": "3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae",
5+
"sig": "1d668531c7a0960cf90825faa684106a8aef0799c1b47e72301bac45d87f2dd42c14f1a3ac7db862323ca5177dd4fd686573ea92aea99638f17414dde561c00b"
6+
}
7+
],
8+
"signed": {
9+
"_type": "timestamp",
10+
"expires": "2020-01-02T00:00:00Z",
11+
"meta": {
12+
"snapshot.json": {
13+
"hashes": {
14+
"sha256": "f4ca389c2c9fbc592d91d4e693c31113b8803a11bcb5ecd973581fa0e3d34ce0",
15+
"sha512": "92a0989e44c0e9f16d3e56268a3b8dd4e4416ee2ac91a4c871a405f1e426062651ec4effa0078fc4409c8b0422ccad9b1aa197db58f178406f398562b2e98195"
16+
},
17+
"length": 431,
18+
"version": 1
19+
}
20+
},
21+
"spec_version": "1.0.0",
22+
"version": 1
23+
}
24+
}

‎client/testdata/Published5TimesWithRotatedKeys_root/client/metadata/current/2.root.json

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
{
2+
"signatures": [
3+
{
4+
"keyid": "05e17c1501d627b2597322f80d33aacec6f30a507552d3326a88913422b0e30b",
5+
"sig": "309302515543a5b06579cc0cf15cdbaa7eae486e5ae9c2d335926826d069138fcebd21062667eb4a950ccf289824d2de3a221b8f8875f6d29a856f5657542003"
6+
},
7+
{
8+
"keyid": "d4dab4b4d68b91665a6d0dac5b4e64677aa6d853fc787669168b4b4ba9822129",
9+
"sig": "81cb58f9fa43cb41931d1608d980d935b5a6ed34d7240a6987c787cc0c34889f7e019aea47656f2792d5b0868844303b3d205441b79daa94f52c0855db511804"
10+
}
11+
],
12+
"signed": {
13+
"_type": "root",
14+
"consistent_snapshot": true,
15+
"expires": "2020-12-31T05:48:20Z",
16+
"keys": {
17+
"05e17c1501d627b2597322f80d33aacec6f30a507552d3326a88913422b0e30b": {
18+
"keyid_hash_algorithms": [
19+
"sha256",
20+
"sha512"
21+
],
22+
"keytype": "ed25519",
23+
"keyval": {
24+
"public": "f758af464295e62a1da4d3267be6d13f4aba9c7d52166d01b6bd5b4559496c9d"
25+
},
26+
"scheme": "ed25519"
27+
},
28+
"3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae": {
29+
"keyid_hash_algorithms": [
30+
"sha256",
31+
"sha512"
32+
],
33+
"keytype": "ed25519",
34+
"keyval": {
35+
"public": "6bac59b8d9e1aae02fae6fba6e7fe3fc9fe5b4a9fe98c3fca255d8c8ec3e5b35"
36+
},
37+
"scheme": "ed25519"
38+
},
39+
"77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93": {
40+
"keyid_hash_algorithms": [
41+
"sha256",
42+
"sha512"
43+
],
44+
"keytype": "ed25519",
45+
"keyval": {
46+
"public": "6400d770c7c1bce4b3d59ce0079ed686e843b6500bbea77d869a1ae7df4565a1"
47+
},
48+
"scheme": "ed25519"
49+
},
50+
"e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4": {
51+
"keyid_hash_algorithms": [
52+
"sha256",
53+
"sha512"
54+
],
55+
"keytype": "ed25519",
56+
"keyval": {
57+
"public": "e6ae9d3b67d7b3ce274130291dd90287f32b8fd72bfb4ac5430859ebd1c28a46"
58+
},
59+
"scheme": "ed25519"
60+
}
61+
},
62+
"roles": {
63+
"root": {
64+
"keyids": [
65+
"05e17c1501d627b2597322f80d33aacec6f30a507552d3326a88913422b0e30b"
66+
],
67+
"threshold": 1
68+
},
69+
"snapshot": {
70+
"keyids": [
71+
"77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93"
72+
],
73+
"threshold": 1
74+
},
75+
"targets": {
76+
"keyids": [
77+
"e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4"
78+
],
79+
"threshold": 1
80+
},
81+
"timestamp": {
82+
"keyids": [
83+
"3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae"
84+
],
85+
"threshold": 1
86+
}
87+
},
88+
"spec_version": "1.0.0",
89+
"version": 2
90+
}
91+
}

‎client/testdata/Published5TimesWithRotatedKeys_root/client/metadata/current/3.root.json

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"signatures": [
3+
{
4+
"keyid": "05e17c1501d627b2597322f80d33aacec6f30a507552d3326a88913422b0e30b",
5+
"sig": "15156589fe9283fddeecb7195e7bdc13cf0e002b4746d10d47f9c98db74e5e10b4092f26b29a1df9eea93fb60648eaf8c6b5f1002621d843bff065dc9d51940a"
6+
},
7+
{
8+
"keyid": "718fedad390b4d0d470b890781eb8c94e5a7e975aebe65fc0862246c945fce68",
9+
"sig": "54a8394b644d5bf8444bf6eef070e0f03b0336a451be671da1dc31b13e241bc618f9ead0f4477c622cee928f970c0754fe00bc354c9ba687305933c75de94306"
10+
},
11+
{
12+
"keyid": "d4dab4b4d68b91665a6d0dac5b4e64677aa6d853fc787669168b4b4ba9822129",
13+
"sig": "b7231c68eb4fa0b13f175b2feb0dbaf27cb14fd8c3c88c52362f33e383752fa158ceca86fd92b5327dcfe5cfbcf30c479aaf60afa9a871dde4197868642e4008"
14+
}
15+
],
16+
"signed": {
17+
"_type": "root",
18+
"consistent_snapshot": true,
19+
"expires": "2020-12-31T05:48:20Z",
20+
"keys": {
21+
"3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae": {
22+
"keyid_hash_algorithms": [
23+
"sha256",
24+
"sha512"
25+
],
26+
"keytype": "ed25519",
27+
"keyval": {
28+
"public": "6bac59b8d9e1aae02fae6fba6e7fe3fc9fe5b4a9fe98c3fca255d8c8ec3e5b35"
29+
},
30+
"scheme": "ed25519"
31+
},
32+
"718fedad390b4d0d470b890781eb8c94e5a7e975aebe65fc0862246c945fce68": {
33+
"keyid_hash_algorithms": [
34+
"sha256",
35+
"sha512"
36+
],
37+
"keytype": "ed25519",
38+
"keyval": {
39+
"public": "82f52e4503dbb364fabe8e5567f1cf909d4175d45468a021dfe75653db9ac98c"
40+
},
41+
"scheme": "ed25519"
42+
},
43+
"77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93": {
44+
"keyid_hash_algorithms": [
45+
"sha256",
46+
"sha512"
47+
],
48+
"keytype": "ed25519",
49+
"keyval": {
50+
"public": "6400d770c7c1bce4b3d59ce0079ed686e843b6500bbea77d869a1ae7df4565a1"
51+
},
52+
"scheme": "ed25519"
53+
},
54+
"e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4": {
55+
"keyid_hash_algorithms": [
56+
"sha256",
57+
"sha512"
58+
],
59+
"keytype": "ed25519",
60+
"keyval": {
61+
"public": "e6ae9d3b67d7b3ce274130291dd90287f32b8fd72bfb4ac5430859ebd1c28a46"
62+
},
63+
"scheme": "ed25519"
64+
}
65+
},
66+
"roles": {
67+
"root": {
68+
"keyids": [
69+
"718fedad390b4d0d470b890781eb8c94e5a7e975aebe65fc0862246c945fce68"
70+
],
71+
"threshold": 1
72+
},
73+
"snapshot": {
74+
"keyids": [
75+
"77dfdca206c0fe1b8e55d67d21dd0e195a0998a9d2b56c6d3ee8f68d04c21e93"
76+
],
77+
"threshold": 1
78+
},
79+
"targets": {
80+
"keyids": [
81+
"e4dae3872d28d29f7624a702bfd25f68453544d597229ee9e0a8569d1f940cf4"
82+
],
83+
"threshold": 1
84+
},
85+
"timestamp": {
86+
"keyids": [
87+
"3a05831328273e4b821c3bbe1fed0c5332749d8e071675879af26a401a5c85ae"
88+
],
89+
"threshold": 1
90+
}
91+
},
92+
"spec_version": "1.0.0",
93+
"version": 3
94+
}
95+
}

0 commit comments

Comments
 (0)