diff options
| -rw-r--r-- | swamid-2.0/idp.it.gu.se-idp-shibboleth.xml | 15 | ||||
| -rw-r--r-- | swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml | 11 | ||||
| -rw-r--r-- | swamid-edugain-idp-1.0.mxml | 2 | ||||
| -rw-r--r-- | swamid-idp-2.0.mxml | 2 |
4 files changed, 17 insertions, 13 deletions
diff --git a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml index 92bf6ea7..c28e01af 100644 --- a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml @@ -1,18 +1,21 @@ <?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://idp.it.gu.se/idp/shibboleth"> <Extensions> - <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> + <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue> </saml: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">gu.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Göteborgs Universitet (gammal)</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">University of Gothenburg (old)</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description> <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description> <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo> @@ -97,8 +100,8 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg== </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">GU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet (gammal)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">University of Gothenburg (old)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml index e8f59940..810a0f76 100644 --- a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml +++ b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml @@ -11,11 +11,12 @@ <Extensions> <shibmd:Scope regexp="false">gu.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Göteborgs Universitet (ny)</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">University of Gothenburg (new)</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description> <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description> - <mdui:Logo height="80" width="80">https://idp3.it.gu.se/idp/images/1510601_logo_sv_126.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints> <mdui:DomainHint>gu.se</mdui:DomainHint> @@ -190,8 +191,8 @@ mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">GU</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet (ny)</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">University of Gothenburg (new)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index 2533b735..197cc391 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -21,7 +21,6 @@ <xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/> @@ -49,4 +48,5 @@ <xi:include href="swamid-2.0/swamid.vr.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/idp3.it.gu.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 2f464a47..c8481af0 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -16,6 +16,6 @@ <xi:include href="swamid-2.0/idp.mdh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/> - <xi:include href="swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/> + <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> |