Skip to content

Commit 74dfdee

Browse files
rglaucorglauco
committed
fix: aligned claims "trust_mark_issuer", "trust_marks_issuers" to trust_mark_issuers
1 parent 7e15d4b commit 74dfdee

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

‎docs/CREATE_A_FEDERATION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ta_conf_data = dict(
7777
metadata=FA_METADATA,
7878
constraints=FA_CONSTRAINTS,
7979
is_active=True,
80-
trust_marks_issuers=TM_ISSUERS,
80+
trust_mark_issuers=TM_ISSUERS,
8181
)
8282
8383
FederationEntityConfiguration.objects.create(**ta_conf_data)

‎examples/federation_authority/dumps/example.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
}
178178
],
179179
"trust_marks": [],
180-
"trust_marks_issuers": {
180+
"trust_mark_issuers": {
181181
"https://www.spid.gov.it/certification/rp/public": [
182182
"https://registry.spid.agid.gov.it",
183183
"https://public.intermediary.spid.it"
@@ -253,7 +253,7 @@
253253
"trust_mark": "eyJhbGciOiJSUzI1NiIsImtpZCI6IkZpZll4MDNibm9zRDhtNmdZUUlmTkhOUDljTV9TYW05VGM1bkxsb0lJcmMifQ.eyJpc3MiOiJodHRwOi8vMTI3LjAuMC4xOjgwMDAvIiwic3ViIjoiaHR0cDovLzEyNy4wLjAuMTo4MDAwL29pZGMvcnAvIiwiaWF0IjoxNjQ1NjEyNDAxLCJpZCI6Imh0dHBzOi8vd3d3LnNwaWQuZ292Lml0L2NlcnRpZmljYXRpb24vcnAiLCJtYXJrIjoiaHR0cHM6Ly93d3cuYWdpZC5nb3YuaXQvdGhlbWVzL2N1c3RvbS9hZ2lkL2xvZ28uc3ZnIiwicmVmIjoiaHR0cHM6Ly9kb2NzLml0YWxpYS5pdC9pdGFsaWEvc3BpZC9zcGlkLXJlZ29sZS10ZWNuaWNoZS1vaWRjL2l0L3N0YWJpbGUvaW5kZXguaHRtbCJ9.mSPNR0AOPBn3UNJAIbrWUMQ8vGTetQajpa3i59JDKDXYWqo2TUGh4AQBghCiG3qqV9cl-hleLtuwoeZ1InKHeslTLftVdcR3meeMLs3mLobHYr26Mi7pC7-jx1ZFVyk4GXl7mn9WVSQGEUOiuhL01tdlUfxf0TJSFSOMEZGpCA3hXroLOnEl3FjkAw7sPvjfImsbadbHVusb72HTTs1n5Xo7z3As3fDWHcxD-fvvq0beu9cx-L2sT4YaNC-ELd1M3m5r0NIjjEUAt4Gnot-l5Z3-C_bA41uvh2hX34U_fGZ6jpmuluJo1Lqi26N8LTB-Rbu0UMaZnkRg9E72_YRZig"
254254
}
255255
],
256-
"trust_marks_issuers": {},
256+
"trust_mark_issuers": {},
257257
"entity_type": "openid_relying_party",
258258
"metadata": {
259259
"federation_entity": {
@@ -343,7 +343,7 @@
343343
}
344344
],
345345
"trust_marks": [],
346-
"trust_marks_issuers": {},
346+
"trust_mark_issuers": {},
347347
"entity_type": "openid_provider",
348348
"metadata": {
349349
"federation_entity": {
@@ -543,7 +543,7 @@
543543
"federation_list_endpoint": "http://127.0.0.1:8000/list"
544544
}
545545
},
546-
"trust_marks_issuers": {
546+
"trust_mark_issuers": {
547547
"https://www.spid.gov.it/certification/rp/public": [
548548
"https://registry.spid.agid.gov.it",
549549
"https://public.intermediary.spid.it"

‎examples/provider/dumps/example.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
}
143143
],
144144
"trust_marks": [],
145-
"trust_marks_issuers": {},
145+
"trust_mark_issuers": {},
146146
"entity_type": "openid_provider",
147147
"metadata": {
148148
"federation_entity": {
@@ -340,7 +340,7 @@
340340
"federation_list_endpoint": "http://127.0.0.1:8000/list"
341341
}
342342
},
343-
"trust_marks_issuers": {
343+
"trust_mark_issuers": {
344344
"https://www.spid.gov.it/certification/rp/public": [
345345
"https://registry.spid.agid.gov.it",
346346
"https://public.intermediary.spid.it"

‎examples/relying_party/dumps/example.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"trust_mark": "eyJhbGciOiJSUzI1NiIsImtpZCI6IkZpZll4MDNibm9zRDhtNmdZUUlmTkhOUDljTV9TYW05VGM1bkxsb0lJcmMifQ.eyJpc3MiOiJodHRwOi8vMTI3LjAuMC4xOjgwMDAvIiwic3ViIjoiaHR0cDovLzEyNy4wLjAuMTo4MDAwL29pZGMvcnAvIiwiaWF0IjoxNjQ1NjEyNDAxLCJpZCI6Imh0dHBzOi8vd3d3LnNwaWQuZ292Lml0L2NlcnRpZmljYXRpb24vcnAiLCJtYXJrIjoiaHR0cHM6Ly93d3cuYWdpZC5nb3YuaXQvdGhlbWVzL2N1c3RvbS9hZ2lkL2xvZ28uc3ZnIiwicmVmIjoiaHR0cHM6Ly9kb2NzLml0YWxpYS5pdC9pdGFsaWEvc3BpZC9zcGlkLXJlZ29sZS10ZWNuaWNoZS1vaWRjL2l0L3N0YWJpbGUvaW5kZXguaHRtbCJ9.mSPNR0AOPBn3UNJAIbrWUMQ8vGTetQajpa3i59JDKDXYWqo2TUGh4AQBghCiG3qqV9cl-hleLtuwoeZ1InKHeslTLftVdcR3meeMLs3mLobHYr26Mi7pC7-jx1ZFVyk4GXl7mn9WVSQGEUOiuhL01tdlUfxf0TJSFSOMEZGpCA3hXroLOnEl3FjkAw7sPvjfImsbadbHVusb72HTTs1n5Xo7z3As3fDWHcxD-fvvq0beu9cx-L2sT4YaNC-ELd1M3m5r0NIjjEUAt4Gnot-l5Z3-C_bA41uvh2hX34U_fGZ6jpmuluJo1Lqi26N8LTB-Rbu0UMaZnkRg9E72_YRZig"
6161
}
6262
],
63-
"trust_marks_issuers": {},
63+
"trust_mark_issuers": {},
6464
"entity_type": "openid_relying_party",
6565
"metadata": {
6666
"federation_entity": {
@@ -159,7 +159,7 @@
159159
"federation_list_endpoint": "http://127.0.0.1:8000/list"
160160
}
161161
},
162-
"trust_marks_issuers": {
162+
"trust_mark_issuers": {
163163
"https://www.spid.gov.it/certification/rp/public": [
164164
"https://registry.spid.agid.gov.it",
165165
"https://public.intermediary.spid.it"

‎examples/wallet_trust_anchor/dumps/ta-ec.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
"jwks_core": [],
2525
"trust_marks": [],
26-
"trust_marks_issuers": {},
26+
"trust_mark_issuers": {},
2727
"entity_type": "federation_entity",
2828
"metadata": {
2929
"federation_entity": {

‎spid_cie_oidc/entity/migrations/0001_initial.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Migration(migrations.Migration):
7777
),
7878
),
7979
(
80-
"trust_marks_issuers",
80+
"trust_mark_issuers",
8181
models.JSONField(
8282
blank=True,
8383
default=dict,

‎spid_cie_oidc/entity/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def _create_jwks():
9797
help_text=_("which trust marks MUST be exposed in its entity configuration"),
9898
default=list,
9999
)
100-
trust_marks_issuers = models.JSONField(
100+
trust_mark_issuers = models.JSONField(
101101
blank=True,
102102
help_text=_(
103103
"Only usable for Trust Anchors and intermediates. "
@@ -219,8 +219,8 @@ def entity_configuration_as_dict(self):
219219
"metadata": self.metadata,
220220
}
221221

222-
if self.trust_marks_issuers:
223-
conf["trust_marks_issuers"] = self.trust_marks_issuers
222+
if self.trust_mark_issuers:
223+
conf["trust_mark_issuers"] = self.trust_mark_issuers
224224

225225
if self.trust_marks:
226226
conf["trust_marks"] = self.trust_marks

‎spid_cie_oidc/entity/statements.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def validate_by_allowed_trust_marks(self) -> bool:
239239
raise MissingTrustMark("Required Trust marks are missing.") # pragma: no cover
240240

241241
trust_mark_issuers_by_id = self.trust_anchor_entity_conf.payload.get(
242-
"trust_marks_issuers", {}
242+
"trust_mark_issuers", {}
243243
)
244244

245245
# TODO : cache of issuers -> it would be better to have a proxy function

‎spid_cie_oidc/entity/tests/settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
metadata=FA_METADATA,
2727
constraints=FA_CONSTRAINTS,
2828
is_active=1,
29-
trust_marks_issuers=TM_ISSUERS,
29+
trust_mark_issuers=TM_ISSUERS,
3030
)
3131
TA_JWK_PRIVATE = {'kty': 'RSA', 'n': 'w8H80eT2zrs2XQ-SApZG9TkuXDuIxANfCVHt4fFqNnOEZaCNWqlTQIo0JiSBE-QmzZ09TYP1BJpESuQf_PUeLRVPfYHsBVk5OYvhT27_nYlV7_1LsFGLxxsIa-hswMMzvW-1_huKLy6Fp0WP0ouUJAHsF_eYVtO1ApRhvlIVd5azM4k7t8Lh8lkCSdF1SfGHfXnXJRb-XensZ0cFSfe2Koq9mD7jpGLXlPpXxj8Ow0g7KYT5kVtWE5ULmNmO7BIN1Hx4HpggbbEGgC9FyjKw4GfFb-csnB-icBPf_60HomjrkFFt6vTjrcqQaHOj-sEjP36N8rMSBiMmiMSPnsHhMQ', 'e': 'AQAB', 'd': 'jEDxjcTZXBbgBV8Bgt7-qfW1FJoHDEFKFxhfMpHQQoETa-jTPhCxOD2MzYM8A-9kKc8tu9r-crTAl1PI42kPnMd283phixd5G5Tv8gSaGdnq-45ka0iRuC7TItUdDiMNb_2YzB4ZLGLNmaIKQJSGqCHEcQuRVyxJtTZwrXaMMOhDqJaWUvUQWF5C7g5O5mOVTkNKw6ujzhqcWa4N3NE-HwcbVW_9st4s1c_ng-DlwLTptaeM5j-LOeZMX1zcVlwYMi5ZkYYY6FHHjYI4nBWDtqhvf-64QaTv8exIjk8PcxHOwhfLTWiHPLk14af7U_pCzkP87WQCBgNfvt3WILQ5DQ', 'p': '75eNHkWaYQMgzVfFwif5uftSxqOhFU6VkxNKdqoRuFxJuVTO-M-vbQc3BwPxms2xrpizU6zGcoPGPvccDi0G040wZh34pWDVABMgGMKXKmeTwj8FuM1DzOVq8DKHmdrhk1gaQbPAP8JVOVYK7uh_lG5wmz3X-En1McMk-E8g8Ic', 'q': '0Sny6DLNtDP1_B9qiyCaMtRqPSAUZ1ohCZRlBT6-IGRR31Kt5S2JcVNDnF5w4dunlDY4nhIBZ0v0VyzWKgDXj6qrFY1pm1iE29gW227YsVRWQU8xWGpBwEu8nxNMr0u0zfe0QEGWU4RvNAsZPRa31HU87Vm7I3NSZ34DZsCZJoc', 'kid': 'HIvo33-Km7n03ZqKDJfWVnlFudsW28YhQZx5eaXtAKA'}
3232
TA_JWK_PUBLIC = {'kty': 'RSA', 'n': 'w8H80eT2zrs2XQ-SApZG9TkuXDuIxANfCVHt4fFqNnOEZaCNWqlTQIo0JiSBE-QmzZ09TYP1BJpESuQf_PUeLRVPfYHsBVk5OYvhT27_nYlV7_1LsFGLxxsIa-hswMMzvW-1_huKLy6Fp0WP0ouUJAHsF_eYVtO1ApRhvlIVd5azM4k7t8Lh8lkCSdF1SfGHfXnXJRb-XensZ0cFSfe2Koq9mD7jpGLXlPpXxj8Ow0g7KYT5kVtWE5ULmNmO7BIN1Hx4HpggbbEGgC9FyjKw4GfFb-csnB-icBPf_60HomjrkFFt6vTjrcqQaHOj-sEjP36N8rMSBiMmiMSPnsHhMQ', 'e': 'AQAB', 'kid': 'HIvo33-Km7n03ZqKDJfWVnlFudsW28YhQZx5eaXtAKA'}
@@ -40,5 +40,5 @@
4040
},
4141
constraints=FA_CONSTRAINTS,
4242
is_active=1,
43-
trust_marks_issuers=TM_ISSUERS,
43+
trust_mark_issuers=TM_ISSUERS,
4444
)

‎spid_cie_oidc/provider/tests/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"jwks_fed": [op_conf_priv_jwk],
1717
"jwks_core": [op_conf_priv_jwk],
1818
"trust_marks": [],
19-
"trust_marks_issuers": {},
19+
"trust_mark_issuers": {},
2020
"entity_type": "openid_provider",
2121
"metadata": {
2222
"openid_provider": {

0 commit comments

Comments
 (0)