Skip to content

Commit bb70600

Browse files
tnytownhaydentherapper
tnytown
and
haydentherapper
authored
Update staging-root.json and test assets (#602)
* Update staging-root.json Change hardcoded root to the new root from sigstore/root-signing#756 Signed-off-by: Hayden B <[email protected]> * wip: test: adjust local assets for staging update Signed-off-by: Andrew Pan <[email protected]> * test_tuf: skip failing getter tests These tests need to be updated for our new trusted root format. Testing for that is landing in #591. Signed-off-by: Andrew Pan <[email protected]> * fixup! test_tuf: skip failing getter tests Signed-off-by: Andrew Pan <[email protected]> * fixup! fixup! test_tuf: skip failing getter tests Signed-off-by: Andrew Pan <[email protected]> * fixup! fixup! fixup! test_tuf: skip failing getter tests Signed-off-by: Andrew Pan <[email protected]> * fixup! fixup! fixup! fixup! test_tuf: skip failing getter tests Signed-off-by: Andrew Pan <[email protected]> * test_tuf: doc Signed-off-by: Andrew Pan <[email protected]> * test: add staging-tuf targets Signed-off-by: Andrew Pan <[email protected]> --------- Signed-off-by: Hayden B <[email protected]> Signed-off-by: Andrew Pan <[email protected]> Co-authored-by: Hayden B <[email protected]>
1 parent 7410af4 commit bb70600

File tree

32 files changed

+1194
-331
lines changed

32 files changed

+1194
-331
lines changed

‎sigstore/_store/staging-root.json‎

Lines changed: 64 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,65 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "e864b064b09791888913104e7f99fec1526df8047aba7170e767534cce0b60bb",
5-
"sig": "d867ae1e99c21ac5e44fb09413d9351fefa37147f56573dc6923651f7badbcefd7a0d5421aacd66ba9394959862930aa5f71f511edaa4dbc4c6de0aaffcd3306"
6-
}
7-
],
8-
"signed": {
9-
"_type": "root",
10-
"consistent_snapshot": false,
11-
"expires": "2032-10-20T18:54:05Z",
12-
"keys": {
13-
"5d2da8f9ad58e2006befdc5724defb2bddca032c4c20934a48365c8af9fe91c4": {
14-
"keyid_hash_algorithms": [
15-
"sha256",
16-
"sha512"
17-
],
18-
"keytype": "ed25519",
19-
"keyval": {
20-
"public": "c5319e3c1f5c89b680fb5ab7fd60f44ee0fa25a15270a667d908c7c74e1f5bd8"
21-
},
22-
"scheme": "ed25519"
23-
},
24-
"77ae02bf54c38218f28158551062a86f7a9320574ab6ae63e5c96a14c801efa3": {
25-
"keyid_hash_algorithms": [
26-
"sha256",
27-
"sha512"
28-
],
29-
"keytype": "ed25519",
30-
"keyval": {
31-
"public": "bb15adf3924c08d23b78f093f7131c1dc5a0716f706d02b7ae46dd6756894b79"
32-
},
33-
"scheme": "ed25519"
34-
},
35-
"8132b9a0526173757a3341d08079e4882c1d9b084f164fc397a572690183516b": {
36-
"keyid_hash_algorithms": [
37-
"sha256",
38-
"sha512"
39-
],
40-
"keytype": "ed25519",
41-
"keyval": {
42-
"public": "f77a1b58274a212cf1947d21eb61c6dbd21aee95a7a579d605d1cbdb510574a6"
43-
},
44-
"scheme": "ed25519"
45-
},
46-
"e864b064b09791888913104e7f99fec1526df8047aba7170e767534cce0b60bb": {
47-
"keyid_hash_algorithms": [
48-
"sha256",
49-
"sha512"
50-
],
51-
"keytype": "ed25519",
52-
"keyval": {
53-
"public": "21eaa32c2a328cbcbf6a254b884eea142f09ef275c8da135989eed6105707336"
54-
},
55-
"scheme": "ed25519"
56-
}
57-
},
58-
"roles": {
59-
"root": {
60-
"keyids": [
61-
"e864b064b09791888913104e7f99fec1526df8047aba7170e767534cce0b60bb"
62-
],
63-
"threshold": 1
64-
},
65-
"snapshot": {
66-
"keyids": [
67-
"77ae02bf54c38218f28158551062a86f7a9320574ab6ae63e5c96a14c801efa3"
68-
],
69-
"threshold": 1
70-
},
71-
"targets": {
72-
"keyids": [
73-
"5d2da8f9ad58e2006befdc5724defb2bddca032c4c20934a48365c8af9fe91c4"
74-
],
75-
"threshold": 1
76-
},
77-
"timestamp": {
78-
"keyids": [
79-
"8132b9a0526173757a3341d08079e4882c1d9b084f164fc397a572690183516b"
80-
],
81-
"threshold": 1
82-
}
83-
},
84-
"spec_version": "1.0",
85-
"version": 1
86-
}
87-
}
2+
"signed": {
3+
"_type": "root",
4+
"spec_version": "1.0",
5+
"version": 1,
6+
"expires": "2024-09-29T16:47:17Z",
7+
"keys": {
8+
"314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600": {
9+
"keytype": "ecdsa-sha2-nistp256",
10+
"scheme": "ecdsa-sha2-nistp256",
11+
"keyid_hash_algorithms": [
12+
"sha256",
13+
"sha512"
14+
],
15+
"keyval": {
16+
"public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXMZ7rD8tWDE4lK/+naJN7INMxNC7\nbMMANDqTQE7WpzyzffWOg59hc/MwbvJtvuxhO9mEu3GD3Cn0HffFlmVRiA==\n-----END PUBLIC KEY-----\n"
17+
}
18+
},
19+
"c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda": {
20+
"keytype": "ecdsa-sha2-nistp256",
21+
"scheme": "ecdsa-sha2-nistp256",
22+
"keyid_hash_algorithms": [
23+
"sha256",
24+
"sha512"
25+
],
26+
"keyval": {
27+
"public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEL3vL/VeaH6nBbo4rekyO4cc/QthS\n+nlyJXCXSnyIMAtLmVTa8Pf0qG6YIVaR0TmLkyk9YoSVsZakxuMTuaEwrg==\n-----END PUBLIC KEY-----\n"
28+
}
29+
}
30+
},
31+
"roles": {
32+
"root": {
33+
"keyids": [
34+
"c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda"
35+
],
36+
"threshold": 1
37+
},
38+
"snapshot": {
39+
"keyids": [
40+
"314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600"
41+
],
42+
"threshold": 1
43+
},
44+
"targets": {
45+
"keyids": [
46+
"c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda"
47+
],
48+
"threshold": 1
49+
},
50+
"timestamp": {
51+
"keyids": [
52+
"314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600"
53+
],
54+
"threshold": 1
55+
}
56+
},
57+
"consistent_snapshot": true
58+
},
59+
"signatures": [
60+
{
61+
"keyid": "c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda",
62+
"sig": "304602210085927cdb96e1d9d0876bfc26b6ceea7421a54f959e30b9af3e12d31f6c750543022100dde611b58a1f2b9fb26c43767138c68f4422cdeb898c8b63f3f0193791030d12"
63+
}
64+
]
65+
}

‎test/unit/assets/staging-tuf/1.registry.npmjs.org.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"signed": {
3+
"_type": "targets",
4+
"spec_version": "1.0",
5+
"version": 1,
6+
"expires": "2024-09-29T16:47:20Z",
7+
"targets": {
8+
"registry.npmjs.org/keys.json": {
9+
"length": 1017,
10+
"hashes": {
11+
"sha256": "7a8ec9678ad824cdccaa7a6dc0961caf8f8df61bc7274189122c123446248426",
12+
"sha512": "881a853ee92d8cf513b07c164fea36b22a7305c256125bdfffdc5c65a4205c4c3fc2b5bcc98964349167ea68d40b8cd02551fcaa870a30d4601ba1caf6f63699"
13+
}
14+
}
15+
}
16+
},
17+
"signatures": [
18+
{
19+
"keyid": "314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600",
20+
"sig": "3044022059bf01a64dd2793d5b630e26d7b6e455b0d6d8b47c23049ae856a122e5cec2ab022068b99b8bb39457e53d500f698cb43f9e640958ed26e5d3a47c29619df61889bc"
21+
}
22+
]
23+
}

‎test/unit/assets/staging-tuf/1.root.json‎

Lines changed: 63 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,65 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "e864b064b09791888913104e7f99fec1526df8047aba7170e767534cce0b60bb",
5-
"sig": "d867ae1e99c21ac5e44fb09413d9351fefa37147f56573dc6923651f7badbcefd7a0d5421aacd66ba9394959862930aa5f71f511edaa4dbc4c6de0aaffcd3306"
6-
}
7-
],
8-
"signed": {
9-
"_type": "root",
10-
"consistent_snapshot": false,
11-
"expires": "2032-10-20T18:54:05Z",
12-
"keys": {
13-
"5d2da8f9ad58e2006befdc5724defb2bddca032c4c20934a48365c8af9fe91c4": {
14-
"keyid_hash_algorithms": [
15-
"sha256",
16-
"sha512"
17-
],
18-
"keytype": "ed25519",
19-
"keyval": {
20-
"public": "c5319e3c1f5c89b680fb5ab7fd60f44ee0fa25a15270a667d908c7c74e1f5bd8"
21-
},
22-
"scheme": "ed25519"
23-
},
24-
"77ae02bf54c38218f28158551062a86f7a9320574ab6ae63e5c96a14c801efa3": {
25-
"keyid_hash_algorithms": [
26-
"sha256",
27-
"sha512"
28-
],
29-
"keytype": "ed25519",
30-
"keyval": {
31-
"public": "bb15adf3924c08d23b78f093f7131c1dc5a0716f706d02b7ae46dd6756894b79"
32-
},
33-
"scheme": "ed25519"
34-
},
35-
"8132b9a0526173757a3341d08079e4882c1d9b084f164fc397a572690183516b": {
36-
"keyid_hash_algorithms": [
37-
"sha256",
38-
"sha512"
39-
],
40-
"keytype": "ed25519",
41-
"keyval": {
42-
"public": "f77a1b58274a212cf1947d21eb61c6dbd21aee95a7a579d605d1cbdb510574a6"
43-
},
44-
"scheme": "ed25519"
45-
},
46-
"e864b064b09791888913104e7f99fec1526df8047aba7170e767534cce0b60bb": {
47-
"keyid_hash_algorithms": [
48-
"sha256",
49-
"sha512"
50-
],
51-
"keytype": "ed25519",
52-
"keyval": {
53-
"public": "21eaa32c2a328cbcbf6a254b884eea142f09ef275c8da135989eed6105707336"
54-
},
55-
"scheme": "ed25519"
56-
}
57-
},
58-
"roles": {
59-
"root": {
60-
"keyids": [
61-
"e864b064b09791888913104e7f99fec1526df8047aba7170e767534cce0b60bb"
62-
],
63-
"threshold": 1
64-
},
65-
"snapshot": {
66-
"keyids": [
67-
"77ae02bf54c38218f28158551062a86f7a9320574ab6ae63e5c96a14c801efa3"
68-
],
69-
"threshold": 1
70-
},
71-
"targets": {
72-
"keyids": [
73-
"5d2da8f9ad58e2006befdc5724defb2bddca032c4c20934a48365c8af9fe91c4"
74-
],
75-
"threshold": 1
76-
},
77-
"timestamp": {
78-
"keyids": [
79-
"8132b9a0526173757a3341d08079e4882c1d9b084f164fc397a572690183516b"
80-
],
81-
"threshold": 1
82-
}
83-
},
84-
"spec_version": "1.0",
85-
"version": 1
86-
}
2+
"signed": {
3+
"_type": "root",
4+
"spec_version": "1.0",
5+
"version": 1,
6+
"expires": "2024-09-29T16:47:17Z",
7+
"keys": {
8+
"314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600": {
9+
"keytype": "ecdsa-sha2-nistp256",
10+
"scheme": "ecdsa-sha2-nistp256",
11+
"keyid_hash_algorithms": [
12+
"sha256",
13+
"sha512"
14+
],
15+
"keyval": {
16+
"public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXMZ7rD8tWDE4lK/+naJN7INMxNC7\nbMMANDqTQE7WpzyzffWOg59hc/MwbvJtvuxhO9mEu3GD3Cn0HffFlmVRiA==\n-----END PUBLIC KEY-----\n"
17+
}
18+
},
19+
"c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda": {
20+
"keytype": "ecdsa-sha2-nistp256",
21+
"scheme": "ecdsa-sha2-nistp256",
22+
"keyid_hash_algorithms": [
23+
"sha256",
24+
"sha512"
25+
],
26+
"keyval": {
27+
"public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEL3vL/VeaH6nBbo4rekyO4cc/QthS\n+nlyJXCXSnyIMAtLmVTa8Pf0qG6YIVaR0TmLkyk9YoSVsZakxuMTuaEwrg==\n-----END PUBLIC KEY-----\n"
28+
}
29+
}
30+
},
31+
"roles": {
32+
"root": {
33+
"keyids": [
34+
"c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda"
35+
],
36+
"threshold": 1
37+
},
38+
"snapshot": {
39+
"keyids": [
40+
"314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600"
41+
],
42+
"threshold": 1
43+
},
44+
"targets": {
45+
"keyids": [
46+
"c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda"
47+
],
48+
"threshold": 1
49+
},
50+
"timestamp": {
51+
"keyids": [
52+
"314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600"
53+
],
54+
"threshold": 1
55+
}
56+
},
57+
"consistent_snapshot": true
58+
},
59+
"signatures": [
60+
{
61+
"keyid": "c8e09a68b5821b75462ae0df52151c81deb7f1838246dc1da8c34cc91ec12bda",
62+
"sig": "304602210085927cdb96e1d9d0876bfc26b6ceea7421a54f959e30b9af3e12d31f6c750543022100dde611b58a1f2b9fb26c43767138c68f4422cdeb898c8b63f3f0193791030d12"
63+
}
64+
]
8765
}

‎test/unit/assets/staging-tuf/1.snapshot.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"signed": {
3+
"_type": "snapshot",
4+
"spec_version": "1.0",
5+
"version": 1,
6+
"expires": "2024-04-19T16:47:48Z",
7+
"meta": {
8+
"registry.npmjs.org.json": {
9+
"length": 713,
10+
"hashes": {
11+
"sha256": "17b361687dbb401c2d51d7ce21688d13547eae7f8e7b2183b7dd6d94fa675705",
12+
"sha512": "3f60a08cdbab650ece48ded43b54943dc816580fdb2f5a2a20c30e878eb2489ab817f0308666cac80da03d75d6f5b71959431b1ba7794335fece8a4ed635eb4d"
13+
},
14+
"version": 1
15+
},
16+
"targets.json": {
17+
"length": 4518,
18+
"hashes": {
19+
"sha256": "cc62e5fb1644717c7429c82b6a1cbd085008f9a2e07aad38573f8fdf9d55386c",
20+
"sha512": "5709bc76bc35da403a9a0a5ec96890db49e797c986eda9e5f7973938dbccad96838c8136617c91f5218cfd919d93745d3942ca6d50a52b5fd0e662e6876b395f"
21+
},
22+
"version": 1
23+
}
24+
}
25+
},
26+
"signatures": [
27+
{
28+
"keyid": "314ae73abd3012fc73bfcc3783e31d03852716597642b891d6a33155c4baf600",
29+
"sig": "304602210082d244d5dab0c20ee07b3229964beffaa8bb0bdf4c5107e2f764619878d124a2022100e7c50116ef636c41348ec49a7502f1c98037238b9c717ee781b62c5154f5a1f0"
30+
}
31+
]
32+
}

0 commit comments

Comments
 (0)