diff options
| -rw-r--r-- | swamid-2.0/idp2.kau.se-idp-shibboleth.xml | 15 | ||||
| -rw-r--r-- | swamid-2.0/weblogin.kau.se-idp-shibboleth.xml | 15 | ||||
| -rw-r--r-- | swamid-edugain-idp-1.0.mxml | 2 | ||||
| -rw-r--r-- | swamid-idp-2.0.mxml | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml index 911c7c60..bbef8d67 100644 --- a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml @@ -1,11 +1,18 @@ <?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2.kau.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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <Extensions> <shibmd:Scope regexp="false">kau.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Karlstads universitet (gammal)</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Karlstad University (old)</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description> <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL> @@ -103,8 +110,8 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9 </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KAU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Karlstads universitet (gammal)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Karlstad University (old)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml index 1467640a..851eabd6 100644 --- a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml +++ b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml @@ -1,18 +1,11 @@ <?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://weblogin.kau.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">kau.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Karlstads universitet (ny)</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Karlstad University (new)</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description> <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL> @@ -204,8 +197,8 @@ cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A== </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">KAU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Karlstads universitet (ny)</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Karlstad University (new)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index 811709e0..a8ab77ca 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -16,7 +16,6 @@ <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/> - <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/> @@ -51,4 +50,5 @@ <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 6f78b8db..96958313 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -14,7 +14,7 @@ <xi:include href="swamid-2.0/miunidp.miun.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/login.fhs.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp.mdh.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> |