summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-interfederations-1.0.mxml2
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml2
-rw-r--r--swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml4
-rw-r--r--swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml2
-rw-r--r--swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml10
-rw-r--r--swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml9
-rw-r--r--swamid-interfederations-1.0/idp.metropolia.fi-idp.xml7
-rw-r--r--swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml10
-rw-r--r--swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml7
-rw-r--r--swamid-interfederations-1.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml64
-rw-r--r--swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml30
-rw-r--r--swamid-interfederations-1.0/sp.www.kielipankki.fi.xml98
-rw-r--r--swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml7
-rw-r--r--swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml4
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml2
18 files changed, 249 insertions, 30 deletions
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index 285eb989..ef03c82b 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -74,6 +74,7 @@
<xi:include href="swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/infra.clarin.dk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
<xi:include href="swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml"/>
<xi:include href="swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml"/>
@@ -95,6 +96,7 @@
<xi:include href="swamid-interfederations-1.0/sp.lat.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.lux17.mpi.nl.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.vs1.corpora.uni-hamburg.de.xml"/>
+<xi:include href="swamid-interfederations-1.0/sp.www.kielipankki.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml"/>
<xi:include href="swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml"/>
<xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index 4047630b..cbe21323 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -43,6 +43,7 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
</md:KeyDescriptor>
<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://birk.wayf.dk/birk.php/fg.ucsyd.dk/adfs/ls/"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://birk.wayf.dk/birk.php/fg.ucsyd.dk/adfs/ls/"/>
</md:IDPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="da">UC SYD</md:OrganizationName>
@@ -52,4 +53,5 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
<md:OrganizationURL xml:lang="da">http://www.ucsyd.dk/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</md:OrganizationURL>
</md:Organization>
+ <md:ContactPerson contactType="support"/>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
index 59340ad2..615a7b36 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -3,13 +3,13 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
<mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
<mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
- <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
index 82aeafe8..9e87d374 100644
--- a/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
@@ -1,8 +1,13 @@
<?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://haka.saimia.fi/idp/shibboleth">
+<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://haka.saimia.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:Extensions>
<shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Saimaa University of Applied Sciences</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Yrkehögskola Saimaa</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</mdui:DisplayName>
+ </mdui:UIInfo>
<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>
diff --git a/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
index 36023a52..8982949a 100644
--- a/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
@@ -4,8 +4,8 @@
<md:Extensions>
<shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
<mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
<mdui:Description xml:lang="en">Aalto University students, faculty and employees.</mdui:Description>
diff --git a/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
index 8889ea8a..70d83020 100644
--- a/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
@@ -4,18 +4,18 @@
<md:Extensions>
<shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
<mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
- <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
<mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
+ <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
<mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
<mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
- <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
+ <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
<mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints>
<mdui:DomainHint>abo.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
index 59a6027c..7c5691cf 100644
--- a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
@@ -5,16 +5,16 @@
<shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
<shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
<mdui:UIInfo>
+ <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
- <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
- <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
<mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
- <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
+ <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
<mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
- <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
+ <mdui:Logo height="256" width="256">https://idp.csc.fi/img/csc.jpg</mdui:Logo>
<mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
<mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints>
@@ -64,6 +64,7 @@ yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SLO"/>
<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://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
</md:IDPSSODescriptor>
diff --git a/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
index 320266a7..b70c7ad9 100644
--- a/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
+++ b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
@@ -1,8 +1,13 @@
<?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://idp.metropolia.fi/idp">
+<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://idp.metropolia.fi/idp">
<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:Extensions>
<shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Helsinki Metropolia University of Applied Sciences</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Metropolia yrkeshögskola</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Metropolia-ammattikorkeakoulu</mdui:DisplayName>
+ </mdui:UIInfo>
<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>
diff --git a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
index 992d4736..21b8ae39 100644
--- a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
@@ -1,8 +1,13 @@
<?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://idp.oamk.fi/idp/shibboleth">
+<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://idp.oamk.fi/idp/shibboleth">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
<md:Extensions>
<shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Oulu University of Applied Sciences</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Oulun ammattikorkeakoulu</mdui:DisplayName>
+ </mdui:UIInfo>
<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>
diff --git a/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
index fb6d339a..67738cad 100644
--- a/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
@@ -1,8 +1,13 @@
<?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://idp.shh.fi/idp/shibboleth">
+<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://idp.shh.fi/idp/shibboleth">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
<md:Extensions>
<shibmd:Scope regexp="false">hanken.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Hanken School of Economics</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Hanken Svenska handelshögskolan</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Hanken Svenska handelshögskolan</mdui:DisplayName>
+ </mdui:UIInfo>
<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>
diff --git a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
index 24b3bce5..d9508d09 100644
--- a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
@@ -7,19 +7,19 @@
<mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
- <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
<mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
+ <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
+ <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
<mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
<mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
- <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
<mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
</mdui:UIInfo>
<mdui:DiscoHints>
- <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
- <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
<mdui:IPHint>193.166.164.0/22</mdui:IPHint>
<mdui:IPHint>193.167.88.0/21</mdui:IPHint>
+ <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
<mdui:DomainHint>tut.fi</mdui:DomainHint>
<mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
</mdui:DiscoHints>
diff --git a/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
index d592e193..66be88ab 100644
--- a/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
@@ -1,8 +1,13 @@
<?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://idp.ulapland.fi/idp/shibboleth">
+<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://idp.ulapland.fi/idp/shibboleth">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
<md:Extensions>
<shibmd:Scope regexp="false">ulapland.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">University of Lapland</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Lapplands universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Lapin yliopisto</mdui:DisplayName>
+ </mdui:UIInfo>
<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>
diff --git a/swamid-interfederations-1.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-1.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..a57ece3c
--- /dev/null
+++ b/swamid-interfederations-1.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+ <md:Extensions>
+ <mdattr:EntityAttributes>
+ <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2016-03-15T09:59:25Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+ </mdrpi:RegistrationInfo>
+ <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">norway</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/user/privacy/</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uio.no</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Stephan</md:GivenName>
+ <md:SurName>Oepen</md:SurName>
+ <md:EmailAddress>lap-developers@ifi.uio.no</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
index cb13a972..982166d1 100644
--- a/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.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>
diff --git a/swamid-interfederations-1.0/sp.www.kielipankki.fi.xml b/swamid-interfederations-1.0/sp.www.kielipankki.fi.xml
new file mode 100644
index 00000000..bd959a66
--- /dev/null
+++ b/swamid-interfederations-1.0/sp.www.kielipankki.fi.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" 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://sp.www.kielipankki.fi">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kielipankki.fi/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
+ <mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
+ <mdui:Logo height="80" width="170">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logo_RGB_2000dpi.png</mdui:Logo>
+ <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">Language Bank, Portal, discussion forum</mdui:Keywords>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <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>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIGOjCCBSKgAwIBAgIQBEdR8xdmmq3NYQebTVAwOjANBgkqhkiG9w0BAQ0FADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTA4MjcwMDAwMDBaFw0xODA4MzExMjAwMDBaMHkxCzAJBgNVBAYT
+AkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEvMC0GA1UEChMm
+Q1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxFzAVBgNVBAMT
+DmtpZWxpcGFua2tpLmZpMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+v+daOgZqZsd6wvdyAcPsQTWGi/OEcvbY3N5SH41XEZlFlKhZJW3SU0vdlgkAn+fY
+C6yIw3nIW6NDyBE77WzG5+231mAYJzHKl4L7EvPtAjKrNOynr1zYOKu5Mq6n9WgG
+Y/MEmPtmLykxm+FIBIrFXHaDA2FNZQ1CEun/nY4iKlhdipKISW6yctwJExaFuUPR
+jo6j7qr3XXidxpyHARoFNTWb4HAF3IXTYub+5BKRWMip6YXmAwBMqzvsd6f9m701
+xBp6zjOl4bnFzq205Cz5i7NZhj1D7nPcJ8KbW/1gHN3HuYj6HWTRZNTHhzTPTV9B
+OEOL6oE+uN2NKFMcfAVWw0BgE+QKeZVdjsOI+I2Ll8CnTrUCNiAXVyB/m4sm154B
+8hx60JaVTxa4xEbjsoKqnaOn7vZUitLqmHYSz/JGqFJ+dcXOvWdzh6dtXKeBhXSn
+DhqKS0eN8h+GImTt5uE7/efQxZ+0NyBA2cRn9iR9Fbr/kx0n8RoFInxtj8ugmpO7
+e0uD1oNIqwJoQMQKDQo/0eAk2X74ZkMFGuHmxEu0pM9O/nORFSyHAaD2RFblIjgy
+qWQG2qyrZcEnMm3I42ul62ok7beKlBZYhpgK7M8gU06XK+XuQhb259BL8Nw95B2A
+Onu2b/n1WtQsi0fYlkcIx3S2AuZDMAoJ3KRqzX3KXc0CAwEAAaOCAdEwggHNMB8G
+A1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBQmMurV4oqK
+pRmk0o+VnrInoIhfCDAtBgNVHREEJjAkgg5raWVsaXBhbmtraS5maYISd3d3Lmtp
+ZWxpcGFua2tpLmZpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNl
+cnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2lj
+ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEIGA1UdIAQ7MDkwNwYJYIZIAYb9bAEB
+MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwbgYI
+KwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
+b20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJF
+TkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQENBQADggEBAIe1
+UzjXF52jTq0x0PySaI+aeFase3+tUAQu3b5qjhpO9l1bGjH/D98iNBWIrJJL+57I
+GT6Ggc0LXh5GbBlqemOO3Bzu4LTQIO8/cr/wTW7k4MeLt6x1BAbqVwIoyo636kyH
+fSw3a32LVZuALKrBXeSuO2X2oDEuy3O35NvRwPpuUWUziXytfwYegSZ3mo6MWR3k
+90ctDVYV2+0X2ZKSfU81InaeSbmYV31VUxQzFobhqUlw7laxJrvIGqytZcMc3Tdl
+ig0D0PX/kw4i1YbuckqO1cYbE3GVwZsqN94X6Uh2WWO3x4xWq+5MdP+xhZ4ASbTc
+ukUJvoKA4qzHcF2rQn4=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kielipankki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">Kielipankki</md:ServiceName>
+ <md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+ <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Martin</md:GivenName>
+ <md:SurName>Matthiesen</md:SurName>
+ <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Tero</md:GivenName>
+ <md:SurName>Aalto</md:SurName>
+ <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
index 2cddb508..591f7512 100644
--- a/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
@@ -1,8 +1,13 @@
<?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://tullbommen.arcada.fi/simplesaml/">
+<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://tullbommen.arcada.fi/simplesaml/">
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
<md:Extensions>
<shibmd:Scope regexp="false">arcada.fi</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Arcada</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Arcada</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Arcada</mdui:DisplayName>
+ </mdui:UIInfo>
<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>
diff --git a/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml b/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
index 4371f571..494bac3e 100644
--- a/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
+++ b/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
@@ -39,4 +39,8 @@
<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:Company>NBI IT</md:Company>
+ <md:EmailAddress>webauth-admin@nbi.ku.dk</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index a0f5cf37..4cd28100 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -21,7 +21,6 @@
<shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
<shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
<shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
@@ -43,7 +42,6 @@
<shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
<shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
<shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
<shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>