summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml89
-rw-r--r--swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml95
-rw-r--r--swamid-sp-2.0.mxml2
-rw-r--r--swamid-testing-sp-1.0.mxml2
4 files changed, 159 insertions, 29 deletions
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
index f834ed40..bb590bad 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -1,19 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-00.its.umu.se/gui-sp">
<md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-02-20T12:56:05Z">
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/Login" index="1"/>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3‑demo‑00</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3‑demo‑00</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
- <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
- <mdui:Logo height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="sv">Ladok för personal ladok3-demo-00.its.umu.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok for employees ladok3-demo-00.its.umu.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+ <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+ <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-demo-00.its.umu.se/logo/ladok_sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-demo-00.its.umu.se/logo/ladok_en.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -43,6 +70,15 @@ EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</md:KeyDescriptor>
<md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
@@ -58,5 +94,46 @@ EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
+ <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
index 6910f1de..ae742555 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-00.its.umu.se/student-sp">
<md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-28T09:03:13Z">
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -24,11 +20,28 @@ and do *NOT* provide it in real time to your partners.
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Ladok för studenter ladok3-demo-00.its.umu.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok for students ladok3-demo-00.its.umu.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+ <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+ <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-demo-00.its.umu.se:442/logo/ladok_sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-demo-00.its.umu.se:442/logo/ladok_en.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo>
@@ -67,19 +80,59 @@ xWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4
<md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
<md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-00.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:Company>ITS, Umeå universitet</md:Company>
+ <md:SurName>Ladok-supporten</md:SurName>
+ <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+ <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 030aebca..5eeeb285 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -701,4 +701,6 @@
<xi:include href="swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-2.0/kth-graylog.cnaas.sunet.se.xml"/>
<xi:include href="swamid-2.0/jss.kau.se-8443-saml-metadata.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 95e62d4e..b80a5f0b 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -31,8 +31,6 @@
<xi:include href="swamid-2.0/uppsala-test.blackboard.com-lms.xml"/>
<xi:include href="swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/konto-test.test.hb.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml"/>
- <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/>
<xi:include href="swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml"/>
<xi:include href="swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml"/>
<xi:include href="swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml"/>