From 2eec349ea1f57cced51d6d9fef6ed304a9919e7e Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sat, 19 Mar 2016 00:02:28 +0100
Subject: 
 https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml
 into swamid-interfederations-2.0

---
 .../shibboleth.uta.fi-idp-shibboleth.xml           | 30 ++++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml
index cb13a972..982166d1 100644
--- a/swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml
@@ -1,8 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.uta.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.uta.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">uta.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Tammerfors universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Tampereen yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Tampere</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Tampere</mdui:Description>
+        <mdui:Description xml:lang="fi">Tampereen yliopisto</mdui:Description>
+        <mdui:Description xml:lang="sv">Tammerfors universitet</mdui:Description>
+        <mdui:Logo height="300" width="300">https://www.uta.fi/resurssit/kuvat/tay_300x300.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">uta.fi uta tay</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uta.fi uta tay</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">uta.fi uta tay</mdui:Keywords>
+        <mdui:InformationURL xml:lang="en">http://www.uta.fi/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://www.uta.fi/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.uta.fi/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>2001:708:320::/48</mdui:IPHint>
+        <mdui:IPHint>153.1.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>uta.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:61.49441,23.78066</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:61.50634,23.82306</mdui:GeolocationHint>
+      </mdui:DiscoHints>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
@@ -38,12 +60,11 @@ JFOZQrlkdonIfIBEIk8JTF6Wg6Hp6dr33wBB7xapJqAhTjM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uta.fi/idp/profile/SAML2/Redirect/SSO"/>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uta.fi/idp/profile/Shibboleth/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">uta.fi</shibmd:Scope>
     </md:Extensions>
@@ -78,7 +99,6 @@ JFOZQrlkdonIfIBEIk8JTF6Wg6Hp6dr33wBB7xapJqAhTjM=</ds:X509Certificate>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uta.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-- 
cgit v1.2.3