Skip to content

Commit 93487a3

Browse files
leifjleifj
authored
Merge pull request #258 from enriquepablo/master
change semantics of the display names of trust profiles
2 parents 8b2c4e9 + 2dc152e commit 93487a3

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎src/pyff/samlmd.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ def discojson_sp(e, global_trust_info=None, global_md_sources=None):
970970

971971
for idp in md_source.findall("{%s}EntityDescriptor" % NS['md']):
972972
idp_json = discojson(idp)
973-
idp_json['trusted'] = dname_external
973+
idp_json['hint'] = dname_external
974974
sp['extra_md'][idp_json['entityID']] = idp_json
975975

976976
sp['profiles'] = {}

‎src/pyff/test/data/metadata/test-sp.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<ti:TrustedEntity>https://idp.u-picardie.fr/idp/shibboleth</ti:TrustedEntity>
6666
</ti:TrustProfile>
6767
<ti:TrustProfile name="other" strict="false">
68-
<ti:DisplayName xml:lang="en">Other Access</ti:DisplayName>
69-
<ti:DisplayName xml:lang="sv">Other Access sv</ti:DisplayName>
68+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
69+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
7070
<ti:FallbackHandler profile="href">https://www.example.org/other</ti:FallbackHandler>
7171
<ti:TrustedEntity include="true">https://login.idp.eduid.se/idp.xml</ti:TrustedEntity>
7272
</ti:TrustProfile>
@@ -187,8 +187,8 @@ D265cqy6Le/toVg=</ds:X509Certificate>
187187
<md:Extensions>
188188
<ti:TrustInfo xmlns:ti="https://seamlessaccess.org/NS/trustinfo">
189189
<ti:TrustProfile name="other" strict="false">
190-
<ti:DisplayName xml:lang="en">Other Access</ti:DisplayName>
191-
<ti:DisplayName xml:lang="sv">Other Access sv</ti:DisplayName>
190+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
191+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
192192
<ti:FallbackHandler profile="href">https://www.example.org/other</ti:FallbackHandler>
193193
<ti:TrustedEntity include="true">https://kimlik.29mayis.edu.tr/simplesaml/saml2/idp/metadata.php</ti:TrustedEntity>
194194
</ti:TrustProfile>
@@ -199,8 +199,8 @@ D265cqy6Le/toVg=</ds:X509Certificate>
199199
<ti:TrustedEntity include="false">https://kimlik.29mayis.edu.tr/simplesaml/saml2/idp/metadata.php</ti:TrustedEntity>
200200
</ti:TrustProfile>
201201
<ti:TrustProfile name="yetanother" strict="false">
202-
<ti:DisplayName xml:lang="en">yet Another Access</ti:DisplayName>
203-
<ti:DisplayName xml:lang="sv">yet Another Access sv</ti:DisplayName>
202+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
203+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
204204
<ti:FallbackHandler profile="href">https://www.example.org/another</ti:FallbackHandler>
205205
<ti:TrustedEntity include="false">https://kimlik.29mayis.edu.tr/simplesaml/saml2/idp/metadata.php</ti:TrustedEntity>
206206
</ti:TrustProfile>
@@ -436,8 +436,8 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
436436
<ti:TrustedEntities match="registrationAuthority">http://www.swamid.se/</ti:TrustedEntities>
437437
</ti:TrustProfile>
438438
<ti:TrustProfile name="customer2" strict="false">
439-
<ti:DisplayName xml:lang="en">Customer 2 Access</ti:DisplayName>
440-
<ti:DisplayName xml:lang="sv">Kundinloggning 2</ti:DisplayName>
439+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
440+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
441441
<ti:FallbackHandler profile="href">https://www.example.org/about</ti:FallbackHandler>
442442
<ti:TrustedEntities match="registrationAuthority">http://www.swamid.se/</ti:TrustedEntities>
443443
</ti:TrustProfile>
@@ -448,8 +448,8 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
448448
<ti:TrustedEntities include="false" match="registrationAuthority">http://www.swamid.se/</ti:TrustedEntities>
449449
</ti:TrustProfile>
450450
<ti:TrustProfile name="customer4" strict="false">
451-
<ti:DisplayName xml:lang="en">Customer 4 Access</ti:DisplayName>
452-
<ti:DisplayName xml:lang="sv">Kundinloggning 4</ti:DisplayName>
451+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
452+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
453453
<ti:FallbackHandler profile="href">https://www.example.org/about</ti:FallbackHandler>
454454
<ti:TrustedEntities include="false" match="registrationAuthority">http://www.swamid.se/</ti:TrustedEntities>
455455
</ti:TrustProfile>
@@ -605,8 +605,8 @@ YJIFVUg+VwfF8XvjH0WKszSmYywVYg==</ds:X509Certificate>
605605
<ti:TrustedEntities match="entity_category">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ti:TrustedEntities>
606606
</ti:TrustProfile>
607607
<ti:TrustProfile name="customer2" strict="false">
608-
<ti:DisplayName xml:lang="en">Customer 2 Access</ti:DisplayName>
609-
<ti:DisplayName xml:lang="sv">Kundinloggning 2</ti:DisplayName>
608+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
609+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
610610
<ti:FallbackHandler profile="href">https://www.example.org/about</ti:FallbackHandler>
611611
<ti:TrustedEntities match="entity_category">http://refeds.org/category/research-and-scholarship</ti:TrustedEntities>
612612
<ti:TrustedEntities match="entity_category">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ti:TrustedEntities>
@@ -618,8 +618,8 @@ YJIFVUg+VwfF8XvjH0WKszSmYywVYg==</ds:X509Certificate>
618618
<ti:TrustedEntities include="false" match="entity_category">http://refeds.org/category/research-and-scholarship</ti:TrustedEntities>
619619
</ti:TrustProfile>
620620
<ti:TrustProfile name="customer4" strict="false">
621-
<ti:DisplayName xml:lang="en">Customer 4 Access</ti:DisplayName>
622-
<ti:DisplayName xml:lang="sv">Kundinloggning 4</ti:DisplayName>
621+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
622+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
623623
<ti:FallbackHandler profile="href">https://www.example.org/about</ti:FallbackHandler>
624624
<ti:TrustedEntities include="false" match="entity_category">http://refeds.org/category/research-and-scholarship</ti:TrustedEntities>
625625
</ti:TrustProfile>
@@ -748,8 +748,8 @@ fbypb1DOrVI=</ds:X509Certificate>
748748
<ti:TrustedEntities match="registrationAuthority">http://www.swamid.se/</ti:TrustedEntities>
749749
</ti:TrustProfile>
750750
<ti:TrustProfile name="customer2" strict="false">
751-
<ti:DisplayName xml:lang="en">Customer 2 Access</ti:DisplayName>
752-
<ti:DisplayName xml:lang="sv">Kundinloggning 2</ti:DisplayName>
751+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
752+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
753753
<ti:FallbackHandler profile="href">https://www.example.org/about</ti:FallbackHandler>
754754
<ti:TrustedEntity include="false">https://login.idp.eduid.se/idp.xml</ti:TrustedEntity>
755755
<ti:TrustedEntities match="registrationAuthority">http://www.swamid.se/</ti:TrustedEntities>
@@ -762,8 +762,8 @@ fbypb1DOrVI=</ds:X509Certificate>
762762
<ti:TrustedEntities match="entity_category">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ti:TrustedEntities>
763763
</ti:TrustProfile>
764764
<ti:TrustProfile name="customer4" strict="false">
765-
<ti:DisplayName xml:lang="en">Customer 4 Access</ti:DisplayName>
766-
<ti:DisplayName xml:lang="sv">Kundinloggning 4</ti:DisplayName>
765+
<ti:DisplayName xml:lang="en">Degraded security</ti:DisplayName>
766+
<ti:DisplayName xml:lang="sv">Degraded security sv</ti:DisplayName>
767767
<ti:FallbackHandler profile="href">https://www.example.org/about</ti:FallbackHandler>
768768
<ti:TrustedEntity include="false">https://login.idp.eduid.se/idp.xml</ti:TrustedEntity>
769769
<ti:TrustedEntities match="entity_category">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ti:TrustedEntities>

0 commit comments

Comments
 (0)