diff options
author | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2016-12-15 09:29:26 +0100 |
---|---|---|
committer | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2016-12-15 09:29:26 +0100 |
commit | a2dfeb1ec281d968b71748647dc0a8bd584be561 (patch) | |
tree | f3605d089784284f04db3e3d01463d612eddfefa | |
parent | 1bbdda90cba8453d42f78aecefbd4e67b939259b (diff) |
Ändrade planer efter kontakt med HH.se
-rw-r--r-- | swamid-2.0/idp.hh.se-idp-shibboleth.xml | 15 | ||||
-rw-r--r-- | swamid-2.0/signon.hh.se-idp-shibboleth.xml | 8 | ||||
-rw-r--r-- | swamid-idp-2.0.mxml | 1 | ||||
-rw-r--r-- | swamid-testing-idp-1.0.mxml | 1 |
4 files changed, 16 insertions, 9 deletions
diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml index 2abda331..e14150ac 100644 --- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml @@ -1,12 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.hh.se/idp/shibboleth"> + <Extensions> + <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> + <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category"> + <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue> + </saml:Attribute> + </attr:EntityAttributes> + </Extensions> <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0"> <Extensions> <shibmd:Scope regexp="false">hh.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad - new</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description> - <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Halmstad University - new</mdui:DisplayName> <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description> </mdui:UIInfo> </Extensions> @@ -176,8 +183,8 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo= </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">HH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad - new</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Halmstad University - new</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml index 07748237..4a0dae4e 100644 --- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml +++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml @@ -4,8 +4,8 @@ <Extensions> <shibmd:Scope regexp="false">hh.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad - old</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Halmstad University - old</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description> <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL> @@ -96,8 +96,8 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE= </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">HH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad - old</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Halmstad University - old</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index cc66403e..0f2eeef9 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -16,4 +16,5 @@ <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml index 9c243011..499400fb 100644 --- a/swamid-testing-idp-1.0.mxml +++ b/swamid-testing-idp-1.0.mxml @@ -44,7 +44,6 @@ <xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.uhr.se-idp-shibboleth.xml"/> |