Skip to content

Commit 600f2aa

Browse files
woodruffwwoodruffw
committed
fixup operator fields everywhere
1 parent 2e5b0af commit 600f2aa

12 files changed

+117
-78
lines changed

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies = [
3939
"rfc3161-client >= 1.0.3,< 1.1.0",
4040
# Both sigstore-models and sigstore-rekor types are unstable
4141
# so we pin them conservatively.
42-
"sigstore-models == 0.0.3",
42+
"sigstore-models == 0.0.4",
4343
"sigstore-rekor-types == 0.0.18",
4444
"tuf ~= 6.0",
4545
"platformdirs ~= 4.2",

‎sigstore/_internal/trust.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
PublicKey,
5050
key_id,
5151
load_der_public_key,
52-
read_embedded,
5352
)
5453
from sigstore.errors import Error, MetadataError, TUFError, VerificationError
5554

‎test/assets/signing_config/signingconfig-only-v1-rekor.v2.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
"majorApiVersion": 1,
77
"validFor": {
88
"start": "2023-04-14T21:38:40Z"
9-
}
9+
},
10+
"operator": "example.com"
1011
},
1112
{
1213
"url": "https://fulcio-old.example.com",
1314
"majorApiVersion": 1,
1415
"validFor": {
1516
"start": "2022-04-14T21:38:40Z",
1617
"end": "2023-04-14T21:38:40Z"
17-
}
18+
},
19+
"operator": "example.com"
1820
}
1921
],
2022
"oidcUrls": [
@@ -23,7 +25,8 @@
2325
"majorApiVersion": 1,
2426
"validFor": {
2527
"start": "2025-04-16T00:00:00Z"
26-
}
28+
},
29+
"operator": "example.com"
2730
}
2831
],
2932
"rekorTlogUrls": [
@@ -32,7 +35,8 @@
3235
"majorApiVersion": 1,
3336
"validFor": {
3437
"start": "2021-01-12T11:53:27Z"
35-
}
38+
},
39+
"operator": "example.com"
3640
}
3741
],
3842
"tsaUrls": [
@@ -41,7 +45,8 @@
4145
"majorApiVersion": 1,
4246
"validFor": {
4347
"start": "2025-04-09T00:00:00Z"
44-
}
48+
},
49+
"operator": "example.com"
4550
}
4651
],
4752
"rekorTlogConfig": {

‎test/assets/signing_config/signingconfig.v2.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
"majorApiVersion": 1,
77
"validFor": {
88
"start": "2023-04-14T21:38:40Z"
9-
}
9+
},
10+
"operator": "example.com"
1011
},
1112
{
1213
"url": "https://fulcio-old.example.com",
1314
"majorApiVersion": 1,
1415
"validFor": {
1516
"start": "2022-04-14T21:38:40Z",
1617
"end": "2023-04-14T21:38:40Z"
17-
}
18+
},
19+
"operator": "example.com"
1820
}
1921
],
2022
"oidcUrls": [
@@ -23,7 +25,8 @@
2325
"majorApiVersion": 1,
2426
"validFor": {
2527
"start": "2025-04-16T00:00:00Z"
26-
}
28+
},
29+
"operator": "example.com"
2730
}
2831
],
2932
"rekorTlogUrls": [
@@ -32,14 +35,16 @@
3235
"majorApiVersion": 1,
3336
"validFor": {
3437
"start": "2021-01-12T11:53:27Z"
35-
}
38+
},
39+
"operator": "example.com"
3640
},
3741
{
3842
"url": "https://rekor-v2.example.com",
3943
"majorApiVersion": 2,
4044
"validFor": {
4145
"start": "2021-01-12T11:53:27Z"
42-
}
46+
},
47+
"operator": "example.com"
4348
}
4449
],
4550
"tsaUrls": [
@@ -48,7 +53,8 @@
4853
"majorApiVersion": 1,
4954
"validFor": {
5055
"start": "2025-04-09T00:00:00Z"
51-
}
56+
},
57+
"operator": "example.com"
5258
}
5359
],
5460
"rekorTlogConfig": {

‎test/assets/staging-tuf/13.snapshot.json renamed to ‎test/assets/staging-tuf/16.snapshot.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"signatures": [
33
{
44
"keyid": "c3479007e861445ce5dc109d9661ed77b35bbc0e3f161852c46114266fc2daa4",
5-
"sig": "3046022100c36bf62c4b5f72f8e3defc1af05148518a282394b304f0e0a154c10feeaee9a1022100ed8bb83508e1fcd3906bdf71af0da30f066a048db0f8da589db7dfe5f1458537"
5+
"sig": "304402202733036a5044a3257392cb6737c80d1972aa2bce8e7194fac23e3d0b939e83ce0220797111c4aa47094278a2997d727c728fcda795b02b8ec803e2265fdac9614a21"
66
}
77
],
88
"signed": {
99
"_type": "snapshot",
10-
"expires": "2035-04-30T07:17:48Z",
10+
"expires": "2035-06-11T11:54:57Z",
1111
"meta": {
1212
"registry.npmjs.org.json": {
1313
"version": 5
1414
},
1515
"targets.json": {
16-
"version": 13
16+
"version": 17
1717
}
1818
},
1919
"spec_version": "1.0",
20-
"version": 13
20+
"version": 16
2121
}
2222
}

‎test/assets/staging-tuf/13.targets.json renamed to ‎test/assets/staging-tuf/17.targets.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"signatures": [
33
{
44
"keyid": "aa61e09f6af7662ac686cf0c6364079f63d3e7a86836684eeced93eace3acd81",
5-
"sig": "3046022100c1968b55a40906590168f9b9ecd2251ef4056f79e9067fb80374ad4bc1a770a102210085d17acfcd779f8d004b54e0c5170e9e4629487603859bf85f4519d46ef3a994"
5+
"sig": "3045022031cbae59944160c1b9b1df859c43cf74d8c5257c32924f1c78146ccd621aae53022100cc8097664966a0f187e41643a61524613434517ec97c9a21f319752fd842e122"
66
},
77
{
88
"keyid": "61f9609d2655b346fcebccd66b509d5828168d5e447110e261f0bcc8553624bc",
9-
"sig": "3046022100fc18a5d048d94be077f240866f344bc679098dde898f4d61ed44ba1cd37f86ec022100cc3b9d06b15ea56f953afbd3917a53c674b86e94ee5d3ffb160f3f465c2fee70"
9+
"sig": "30440220149fb96582721bcaf506b06465cf8df9b4b4c7847f19165eec8f7faeccc61ed8022020090a30e448e7cd71824bf0042ce9982b8882e557be343a919ffc4d825927f6"
1010
},
1111
{
1212
"keyid": "9471fbda95411d10109e467ad526082d15f14a38de54ea2ada9687ab39d8e237",
@@ -44,7 +44,7 @@
4444
}
4545
]
4646
},
47-
"expires": "2035-04-27T13:57:15Z",
47+
"expires": "2035-06-10T18:17:38Z",
4848
"spec_version": "1.0",
4949
"targets": {
5050
"ctfe.pub": {
@@ -133,18 +133,18 @@
133133
},
134134
"signing_config.v0.2.json": {
135135
"hashes": {
136-
"sha256": "cb9a48c332a0d515db7760ad6972a09a0f4ed721fe5e839b70371e0d0802abe2"
136+
"sha256": "0f395087486ba318321eda478d847962b1dd89846c7dc6e95752a6b110669393"
137137
},
138-
"length": 885
138+
"length": 1022
139139
},
140140
"trusted_root.json": {
141141
"hashes": {
142-
"sha256": "3f8ab41b9311910106caf66cb5e4117b1bee0d1871def4e816c6c60cee69d421"
142+
"sha256": "ed6a9cf4e7c2e3297a4b5974fce0d17132f03c63512029d7aa3a402b43acab49"
143143
},
144-
"length": 6399
144+
"length": 6824
145145
}
146146
},
147-
"version": 13,
147+
"version": 17,
148148
"x-tuf-on-ci-expiry-period": 3650,
149149
"x-tuf-on-ci-signing-period": 365
150150
}

‎test/assets/staging-tuf/targets/cb9a48c332a0d515db7760ad6972a09a0f4ed721fe5e839b70371e0d0802abe2.signing_config.v0.2.json renamed to ‎test/assets/staging-tuf/targets/0f395087486ba318321eda478d847962b1dd89846c7dc6e95752a6b110669393.signing_config.v0.2.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"majorApiVersion": 1,
77
"validFor": {
88
"start": "2022-04-14T21:38:40Z"
9-
}
9+
},
10+
"operator": "sigstore.dev"
1011
}
1112
],
1213
"oidcUrls": [
@@ -15,7 +16,8 @@
1516
"majorApiVersion": 1,
1617
"validFor": {
1718
"start": "2025-04-16T00:00:00Z"
18-
}
19+
},
20+
"operator": "sigstore.dev"
1921
}
2022
],
2123
"rekorTlogUrls": [
@@ -24,7 +26,8 @@
2426
"majorApiVersion": 1,
2527
"validFor": {
2628
"start": "2021-01-12T11:53:27Z"
27-
}
29+
},
30+
"operator": "sigstore.dev"
2831
}
2932
],
3033
"tsaUrls": [
@@ -33,7 +36,8 @@
3336
"majorApiVersion": 1,
3437
"validFor": {
3538
"start": "2025-04-09T00:00:00Z"
36-
}
39+
},
40+
"operator": "sigstore.dev"
3741
}
3842
],
3943
"rekorTlogConfig": {

‎test/assets/staging-tuf/targets/3f8ab41b9311910106caf66cb5e4117b1bee0d1871def4e816c6c60cee69d421.trusted_root.json renamed to ‎test/assets/staging-tuf/targets/ed6a9cf4e7c2e3297a4b5974fce0d17132f03c63512029d7aa3a402b43acab49.trusted_root.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@
1414
"logId": {
1515
"keyId": "0y8wo8MtY5wrdiIFohx7sHeI5oKDpK5vQhGHI6G+pJY="
1616
}
17+
},
18+
{
19+
"baseUrl": "https://log2025-alpha1.rekor.sigstage.dev",
20+
"hashAlgorithm": "SHA2_256",
21+
"publicKey": {
22+
"rawBytes": "MCowBQYDK2VwAyEAPn+AREHoBaZ7wgS1zBqpxmLSGnyhxXj4lFxSdWVB8o8=",
23+
"keyDetails": "PKIX_ED25519",
24+
"validFor": {
25+
"start": "2025-04-16T00:00:00Z"
26+
}
27+
},
28+
"logId": {
29+
"keyId": "8w1amZ2S5mJIQkQmPxdMuOrL/oJkvFg9MnQXmeOCXck="
30+
}
1731
}
1832
],
1933
"certificateAuthorities": [

‎test/assets/staging-tuf/timestamp.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"signatures": [
33
{
44
"keyid": "c3479007e861445ce5dc109d9661ed77b35bbc0e3f161852c46114266fc2daa4",
5-
"sig": "30450220665b03b09118979b8c8d93b55077279e0424ae5802a0f59e14fdccef49b0c420022100f2fd10223ca19ee7e0671839e69508e8fd4a5ea875cf7e19fe6d0d77acd604a3"
5+
"sig": "3046022100fedb5a3d1a3c461c1337d7535edca8012fb0ab8da31315dbdf22b7f38f76973e022100a87967789d2d2942919dcc4f33def8ee74745f577ff0ef5479cc9f573842e8de"
66
}
77
],
88
"signed": {
99
"_type": "timestamp",
10-
"expires": "2025-05-09T07:17:49Z",
10+
"expires": "2025-07-29T13:28:44Z",
1111
"meta": {
1212
"snapshot.json": {
13-
"version": 13
13+
"version": 16
1414
}
1515
},
1616
"spec_version": "1.0",
17-
"version": 280
17+
"version": 353
1818
}
1919
}

‎test/assets/trust_config/config.v1.json

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,18 @@
121121
"url": "https://fulcio.example.com",
122122
"majorApiVersion": 1,
123123
"validFor": {
124-
"start": "2023-04-14T21:38:40Z"
125-
}
124+
"start": "2023-04-14T21:38:40Z"
125+
},
126+
"operator": "example.com"
126127
},
127128
{
128129
"url": "https://fulcio-old.example.com",
129130
"majorApiVersion": 1,
130131
"validFor": {
131-
"start": "2022-04-14T21:38:40Z",
132-
"end": "2023-04-14T21:38:40Z"
133-
}
132+
"start": "2022-04-14T21:38:40Z",
133+
"end": "2023-04-14T21:38:40Z"
134+
},
135+
"operator": "example.com"
134136
}
135137
],
136138
"oidcUrls": [
@@ -139,23 +141,26 @@
139141
"majorApiVersion": 1,
140142
"validFor": {
141143
"start": "2025-04-16T00:00:00Z"
142-
}
144+
},
145+
"operator": "example.com"
143146
}
144-
],
145-
"rekorTlogUrls": [
147+
],
148+
"rekorTlogUrls": [
146149
{
147150
"url": "https://rekor.example.com",
148151
"majorApiVersion": 1,
149152
"validFor": {
150153
"start": "2021-01-12T11:53:27Z"
151-
}
154+
},
155+
"operator": "example.com"
152156
},
153157
{
154158
"url": "https://rekor-v2.example.com",
155159
"majorApiVersion": 2,
156160
"validFor": {
157161
"start": "2021-01-12T11:53:27Z"
158-
}
162+
},
163+
"operator": "example.com"
159164
}
160165
],
161166
"tsaUrls": [
@@ -164,7 +169,8 @@
164169
"majorApiVersion": 1,
165170
"validFor": {
166171
"start": "2025-04-09T00:00:00Z"
167-
}
172+
},
173+
"operator": "example.com"
168174
}
169175
],
170176
"rekorTlogConfig": {

0 commit comments

Comments
 (0)