moodlebeta.omv.lu.se added

Ladok3 utb2 added
SWAMIDOPS-8516
SWAMIDOPS-8515
SWAMIDOPS-8514

5 files changed, 220 insertions, 33 deletions

diff --git a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml b/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
index 62f5cd5f..d5522269 100644
--- a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
+++ b/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
@@ -26,37 +26,37 @@
   </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://moodle.med.lu.se/Shibboleth.sso/Login"/>
+      <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://moodlebeta.omv.lu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">moodlebeta.omv.lu.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">moodlebeta.omv.lu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testplattform för av moodle med shibbad autentisering</mdui:Description>
-        <mdui:Description xml:lang="en">Test platform for moodle with shibb authentication</mdui:Description>
+        <mdui:DisplayName xml:lang="en">moodlebeta.omv.lu.se </mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testplattform för moodle med "shibbad" autentisering</mdui:Description>
+        <mdui:Description xml:lang="en">Test moodle system with shibboleth authentication</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://moodlebeta.omv.lu.se</ds:KeyName>
+        <ds:KeyName>https://moodlebeta.omv.lu.se/shibboleth</ds:KeyName>
         <ds:KeyName>moodlebeta.omv.lu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=moodlebeta.omv.lu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAMso7KaUhg8xMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFG1vb2RsZWJldGEub212Lmx1LnNlMB4XDTE3MDEwMzEwMDYzOVoXDTI3MDEw
-MTEwMDYzOVowHzEdMBsGA1UEAxMUbW9vZGxlYmV0YS5vbXYubHUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgBejVjjlhW3CrsGMU7B+28FtbgRRS
-5VJZGF82azfsPZTUxzRYs2vRoEJYRlLqXow45WALBNx7ass7iHvfBzi/UKUCKuc5
-Hagg2fR7VnYJpSP4KTlmS1IUsT6GwQvTrLi9U9/pXtJcSXPpXWDDL+uMgEJG4xg2
-AGsIQds2NlJM4lz0jU+mDKLFfqK5Vu6Z2iJ0UMJ+00CqeDkR8SerzSysF6D/m6zD
-uttWudsQpJCZ/ZuoHHIJ8hanDSF4bCwKQaNFot+CijJob63eQtLs0Qys2849sVuQ
-5EoV8cnuoNiq7qjzoU5tGYb9i1fejPMWn4OFz9I3ni2kNUOQkvzyNRe5AgMBAAGj
-YDBeMD0GA1UdEQQ2MDSCFG1vb2RsZWJldGEub212Lmx1LnNlhhxodHRwczovL21v
-b2RsZWJldGEub212Lmx1LnNlMB0GA1UdDgQWBBSuU7/YG+J4X2IvtJLQvkIO3tXh
-ojANBgkqhkiG9w0BAQUFAAOCAQEAiOVQe7y6K3csMRKXdcuTOxAGO0abKSmzLzpD
-AOGQpFey2ySrsnmC5Vm7LTpRziXqen5CqQG1bukT8K4B41DF2qjxpbQnIvDsYN2R
-pRjoXvjpEerrjuI2fZERzG6zCvn+VqBGzWeQavm549JnZ+pRQDkgVxtmlISl9QKk
-7ZjfFy4a02uk5owtmw5eNleu7R/z79Eif+ZiIWP1eqh4oVkGc0eRAAeq1oDqRi/1
-/lqn02OURrv9CPKFcq+7IbSamk1SgYtPNRqOtzniJxI2GfzEt+ppRTHgMNd23vW2
-SG6CjMKsyGZ4JNTe2xyiyzBmgOLuZ2UI+SN5bUrkTXx9HJBkXA==
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMePkgfbFsJkMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFG1vb2RsZWJldGEub212Lmx1LnNlMB4XDTE3MDMxMDE0MDgzM1oXDTI3MDMw
+ODE0MDgzM1owHzEdMBsGA1UEAxMUbW9vZGxlYmV0YS5vbXYubHUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96jPhgGPjR7tkOi2MNwsBfNp+bv6A
+jcMYl1rAtYvy8XkV5tpxqjZUuag5SwdfN3ocawzJ7wfz3637K57YiKHMcsq137Kk
+UyJFnHpE36QN8XfL3FjsExSdQj25Nl30F3UnlyHE0FuvZY/gHag/IrckTrvVKAbx
+ePtN10voFVWjs3KqHNLKoQtiZT+xtou3jzuYiZuKAwjYsZ9SaZM/Y1OurDo8p0Ai
+n3W9BlCBfPgicCF5WSccTIClnsf2sLSzEnjbyUvrshmqdWvH+RYiGAfOrwIKeB3M
+9ReY2N7mIEb9XGg5kvlWEKgORUuBnB9zPqYdWBvNWeEnOY3QX/XWr8mDAgMBAAGj
+azBpMEgGA1UdEQRBMD+CFG1vb2RsZWJldGEub212Lmx1LnNlhidodHRwczovL21v
+b2RsZWJldGEub212Lmx1LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFGjAFHQTjOuJ
+BLngaZ7Ub7dAkdNmMA0GCSqGSIb3DQEBBQUAA4IBAQCBUTUgSW0KiWeUvAxBFD0U
+5vh7ONsWLALt/A2DaPjBnt8mSwpNTxVDOsG6xRsWd3PBAlAMdRegBa+AVnHZ73bB
+t0K2KG+0wWAxoN1CzVZkpHSseJo7gvqyr4hPbvjjEBgzfy+uLKrsFugSJ2prDoz1
+UlS5oga5aSGbGsx+m0a/r1fHFxP7Bl1v6zVWmFqk6FWXQ9Hk4nHCYDOr70NXvots
+Sn478pAA2nM4qcMSUl0m2Fk9GAWUwwpnXdB6p52xLg8Xk6U89xTBG/o1QWAqya8J
+qfYd+5n3MyDjz52nTvvpNGwQ6Hp2Y0HBNaR6L1ia/WX84LcneVyDvCwDUESMPWT1
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -70,16 +70,16 @@ SG6CjMKsyGZ4JNTe2xyiyzBmgOLuZ2UI+SN5bUrkTXx9HJBkXA==
       <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://moodle.med.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle.med.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle.med.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.med.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.med.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Niklas</md:GivenName>
diff --git a/swamid-2.0/student.utb2.ladok.se-student-sp.xml b/swamid-2.0/student.utb2.ladok.se-student-sp.xml
new file mode 100644
index 00000000..2cb3f99f
--- /dev/null
+++ b/swamid-2.0/student.utb2.ladok.se-student-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.utb2.ladok.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://student.utb2.ladok.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://student.utb2.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.utb2.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.utb2.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://student.utb2.ladok.se/branded/HSK/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://student.utb2.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.utb2.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.utb2.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPStLfWtHv8eMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXN0dWRlbnQudXRiMi5sYWRvay5zZTAeFw0xNzAzMTMxMTE2MjRaFw0yNzAz
+MTExMTE2MjRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudXRiMi5sYWRvay5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOHMrGo61ebP4mT48B02x/WdSwpm
+qG0RDGdcPx01jqNRph3bQj2PbWGpFBt2mRJALZCCbf9sIhGiaXWYROJxn54mWIkj
+eQv5rgzjhj/FcCxiVm3Er8Dq6tv3vjZwcuH5q9/SxGGRQO6bo5igNebqEgAeoXFl
+FFVO2apZP5qE4BZ8Fb+8mZbpsVnqEfe0AXCT4Lsd22zoN7P43HslWWYeli5dcg11
+/AK3Rde+SSD4nfhYJZw3XrWdOV1cquG0BdCd/JKH0oVb08yZPs06XELuLYFAjkYK
+hWDRBV0YSZHpO9HFozBymBZKi7BTMrsTSoi1dv6m72pB4eUaBDbv5/lWyHECAwEA
+AaNtMGswSgYDVR0RBEMwQYIVc3R1ZGVudC51dGIyLmxhZG9rLnNlhihodHRwczov
+L3N0dWRlbnQudXRiMi5sYWRvay5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBSKmgbx
+JDLd0/W1fs93U05dmzalRzANBgkqhkiG9w0BAQsFAAOCAQEAZlLv1eyFfQita2n/
+OlbHh5WR24EQos4lJd+g1pznm0M7KqfI2p+18HxDoC5P/S3mpV1EANdU2NGd2foS
+pbcQ8aoBTg6nFa/kHqObUkdneozEMMAGt+jecsFaR0oWmsBpp/yMViRrYEmFF+sv
+eoKnMsOtpdd/SmKBaexq2hNpGZXDylBzsd4i4N9EYaq1rbPTinFoLbQQL5D0/FTM
+bEpwFk9wqlwDyoODf67DB0n+oEyluHhfi7sKzEupjsGnmsZYGMTlCxOtUW+cwTY1
+4xqevJh6KPmpUjpRCWRMEIkCUEwfNB/D23IkXYoYpr3cy2VFPL9rAKHPANAyOH6j
+EkBQkA==
+</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://student.utb2.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb2.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb2.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
index 46bb7700..dea1c364 100644
--- a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
@@ -38,7 +38,7 @@ and do *NOT* provide it in real time to your partners.
         <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.utv1.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo height="64" width="64">https://www.utb1.ladok.se/branded/HSK/logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/www.utb2.ladok.se-gui-sp.xml b/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..fdec7332
--- /dev/null
+++ b/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb2.ladok.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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://www.utb2.ladok.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://www.utb2.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok www.utb2.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.utb2.ladok.se</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.utb2.ladok.se/branded/HSK/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.utb2.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.utb2.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.utb2.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAIf7iqkGRjAYMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
+BAMTEXd3dy51dGIyLmxhZG9rLnNlMB4XDTE3MDMxMzA5NTk1OVoXDTI3MDMxMTA5
+NTk1OVowHDEaMBgGA1UEAxMRd3d3LnV0YjIubGFkb2suc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMMRaelknlKLqzo0ieyuezfWszMG34yEsWGx/i
+ELokGpYrxuPM7amP+E5V2DbsmWgBTJFD+zkV3es2EQPt5CVD9Lt1JRD/Fnyax3aP
+83VURF+joV3J+fp1VSfEcvE5lZkUncan8Vdj/xs2pLJUP3MtN7VbLSwjDJvYpyp6
++hJxtldh6xJ3NcA6+XyY/ZAHHbK0GG/u1mMjUk28E5aZv3U4Lwb3h77rGZrGP3r8
+5KyI3VYexjbwkklfepFS2iFx6rGHs64Kq9Z0/7SlnYRIEF0A8GPxrmYYMYKM0QOs
+7zG9X0nHMNdEOpo2QZberJs7xbs4XKgOgf4iKMpjn/4qKeLbAgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEXd3dy51dGIyLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIyLmxh
+ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUv6vJR6glRnsS32nclhRryJOAN94wDQYJ
+KoZIhvcNAQELBQADggEBAAL5pkqnkYJeezBb8Agmp8uHSMd+8laNbhv0fvUhGznV
+y+PgROw7HZ15oMZ0vXZlHpeRWpDJ39D0mjgmZDVG2TqoQQh5NVTjsEfFMeRybDPw
+ejvY8pFEBFxejqpizIYFGELUG1K+K0QRIOWY0rBojWP0uceRJqMW7DQQMTRBkDKG
+f21oSOpTDq5Qsynm3dRESp+ur5gBnONn0ayIuVehypt80sXLpF3QOCf/8cgTlKTA
+J2SulBZ/GU8WpyiZFlc7c2Ngw+yFfpOR5+6ez5jApKvwQ2vVm23BIdJw0KFq6Aln
+soJZI3B7GaeKhEWM6sEi+O9NIG7neyjJMWpXT0xQxec=
+</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://www.utb2.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb2.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb2.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1ee153da..51ec8fb7 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -624,4 +624,7 @@
   <xi:include href="swamid-2.0/play.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.rkh.se.xml"/>
+  <xi:include href="swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/student.utb2.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.utb2.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>