Resolves SWAMIDOPS-296 and SWAMIDOPS-298

5 files changed, 193 insertions, 100 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index efcd16df..93b94d1b 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -73,7 +73,6 @@ idp2-test.slu.se-idp-shibboleth.xml
 idp2.hig.se-idp-shibboleth.xml
 idp2.hv.se-idp-shibboleth.xml
 idp.test.antagning.se-aws-idp.xml
-its-pd0001.ad.umu.se-shibboleth.xml
 its-pd0328.ad.umu.se-shibboleth.xml
 its-pd0030.ad.umu.se-shibboleth.xml
 its-pd0062.ad.umu.se-shibboleth-sp.xml
diff --git a/swamid-2.0/client200-151.its.umu.se-shibboleth.xml b/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..5f662ae1
--- /dev/null
+++ b/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://client200-151.its.umu.se/shibboleth">
+  <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">
+    <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://client200-151.its.umu.se/Shibboleth.sso/DS/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://client200-151.its.umu.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Utvecklarmaskin för Tommy Larsson, ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Development workstation for Tommy Larsson, ITS, Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utveckling av främst Servicedesk</mdui:Description>
+        <mdui:Description xml:lang="en">Development of Servicedesk</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>client200-its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=client200-its.umu.se,OU=its,O=umea universitet,L=umea,ST=vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAPh8rM94VWa/MA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMdmFzdGVyYm90dGVuMQ0wCwYDVQQHEwR1bWVhMRkw
+FwYDVQQKExB1bWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLEwNpdHMxHTAbBgNVBAMT
+FGNsaWVudDIwMC1pdHMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21teS5sYXJz
+c29uQHVtdS5zZTAeFw0xNzExMDgwNzQxMzZaFw0yMDA5MjEwNzQxMzZaMIGgMQsw
+CQYDVQQGEwJTRTEVMBMGA1UECBMMdmFzdGVyYm90dGVuMQ0wCwYDVQQHEwR1bWVh
+MRkwFwYDVQQKExB1bWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLEwNpdHMxHTAbBgNV
+BAMTFGNsaWVudDIwMC1pdHMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21teS5s
+YXJzc29uQHVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvC
+dF0U4BJDpPCf3KP7AIxOjbTHXsKxkCuZtjdaD06mpaYoHc8ZyzsWo4WSBybCp264
+FfaT92M3HEhUbc+vDIKIXAPdQrRfm8JdW3otzLWcH+wSfucVAcJnIiKEQSeceFhL
+oa5I84yzfwbPtpbiN2kOuxLVR5V9+qRWmxq+7pJdRI1Vz1KJ4C0SzvhePocaQ0yB
+DmCLo0GpO7yN4kqgNFLQHlrNOWoVd3vyeAPRkOHuXdV6jPkW0/0mis0vGtlJJ1I9
+01O/vnQ4kdJ2RvFnei+MmAQtPQ7+aeYu4xiwZgyMXtSW+2knOXZjMOpXOT2CPQ7+
+DuDoKQN4izb7Vn7IUTMCAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSALwUm8rlIkH4l
+6A5d0eIxfa527jCB1QYDVR0jBIHNMIHKgBSALwUm8rlIkH4l6A5d0eIxfa527qGB
+pqSBozCBoDELMAkGA1UEBhMCU0UxFTATBgNVBAgTDHZhc3RlcmJvdHRlbjENMAsG
+A1UEBxMEdW1lYTEZMBcGA1UEChMQdW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECxMD
+aXRzMR0wGwYDVQQDExRjbGllbnQyMDAtaXRzLnVtdS5zZTEjMCEGCSqGSIb3DQEJ
+ARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQD4fKzPeFVmvzAMBgNVHRMEBTADAQH/
+MA0GCSqGSIb3DQEBCwUAA4IBAQBPaTweT1HKR4urdX1/Zs9ZDcb4tdJ91rYD7F+3
+vtI0NfK5Zm9Rf5SMa24D1t5Ty9rA5UI6lbh7XtHLAjGsRfXFdFSuLncdZDyu2lR9
+MhD5tR3LEUC6MHpWntHmPtEE4+s51vSm6YG95URmMEniT9cEz0vprG/dqabU1fQr
+dHnxhk58LZ8++ctmDzuiPz06ZsmK97A11FrybisJ7xvZo89+jJSGRh1EEOgi5hCu
+0lA2Xc5NSPNHPpiJiT/VAfbNk3VyQWzel7wJpmQrFm1FbVsd5c9CIYgBn0kIhqht
+a0EsY32piHtFDD51gh4rI8GPrW6p/iP1w7REWkZq0yIrTpEI
+</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://client200-151.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://client200-151.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://client200-151.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-151.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-151.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-151.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tommy</md:GivenName>
+    <md:SurName>Larsson</md:SurName>
+    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/client200-190.its.umu.se-shibboleth.xml b/swamid-2.0/client200-190.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..6901cf5a
--- /dev/null
+++ b/swamid-2.0/client200-190.its.umu.se-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://client200-190.its.umu.se/shibboleth">
+  <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">
+    <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://client200-190.its.umu.se/Shibboleth.sso/DS/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://client200-190.its.umu.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Utvecklarmaskin för Andreas Berglund, ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Development workstation for Andreas Berglund, ITS, Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utveckling av främst Servicedesk</mdui:Description>
+        <mdui:Description xml:lang="en">Development of Servicedesk</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>client200-190.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=andreas.berglund@its.umu.se,CN=client200-190.its.umu.se,OU=its,O=umea universitet,L=umea,ST=vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE8TCCA9mgAwIBAgIJAMq/pOiamac4MA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMdmFzdGVyYm90dGVuMQ0wCwYDVQQHEwR1bWVhMRkw
+FwYDVQQKExB1bWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLEwNpdHMxITAfBgNVBAMT
+GGNsaWVudDIwMC0xOTAuaXRzLnVtdS5zZTEqMCgGCSqGSIb3DQEJARYbYW5kcmVh
+cy5iZXJnbHVuZEBpdHMudW11LnNlMB4XDTE3MTEwODEyMjExNFoXDTIwMDkyMTEy
+MjExNFowgasxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwx2YXN0ZXJib3R0ZW4xDTAL
+BgNVBAcTBHVtZWExGTAXBgNVBAoTEHVtZWEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsT
+A2l0czEhMB8GA1UEAxMYY2xpZW50MjAwLTE5MC5pdHMudW11LnNlMSowKAYJKoZI
+hvcNAQkBFhthbmRyZWFzLmJlcmdsdW5kQGl0cy51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCwNMF+NFGGgXmDSGGLHIZzjV/LcEwJuM/JPZo6
+OxZNemibW2R56MBap/qm+4ey1ARdEICyUMKgKj0/TzLQo8U7O464eNXmt8LC7v8o
+kQ56gOsspUS3IilUjleiJnl11+RRuNiv3llatIoUoUCM9Jkq2dZz2OWJKQ/maYBp
+PPqNCzNvN4rkn8hC+yZD32ms9fZoI15hwGPyRxKlsTNPQTZsNgTI/2iWozhlq+lY
+4XiReJtud2aV3TZOlv8l84bg6Qmgo3UWwPw7U3rSlCBV2zo5QHHpMFG0tk2aRkKi
+5PwNlrcfzaIkDqaMxTgBkPL3Rrdcr1vlQMZF9O0pbtl88SmfAgMBAAGjggEUMIIB
+EDAdBgNVHQ4EFgQUolQvtmvBnOF3+IXLUNApmccmXNQwgeAGA1UdIwSB2DCB1YAU
+olQvtmvBnOF3+IXLUNApmccmXNShgbGkga4wgasxCzAJBgNVBAYTAlNFMRUwEwYD
+VQQIEwx2YXN0ZXJib3R0ZW4xDTALBgNVBAcTBHVtZWExGTAXBgNVBAoTEHVtZWEg
+dW5pdmVyc2l0ZXQxDDAKBgNVBAsTA2l0czEhMB8GA1UEAxMYY2xpZW50MjAwLTE5
+MC5pdHMudW11LnNlMSowKAYJKoZIhvcNAQkBFhthbmRyZWFzLmJlcmdsdW5kQGl0
+cy51bXUuc2WCCQDKv6TompmnODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4IBAQBojcOAZwxcByhfpEDr64+rZIPWF/aeg0xoveykGcFwIDe/RZWvA0tqkYas
+ubqHlsgbr1qdzMQZ1q2fq90xLeCEzD1Drvsyrgp+Kqa9+qWkwyxm8rXd3aLgQ0Lj
+j/kRi9l+EURGRp5MPsa3l96NrDP4RWCWObDz+3QZT/p2Li9wG9MpYaSjTuSVZ22t
+sxj2X+WPO6oarfWo6OtgMh/Az7u0K78kKh1vJI6qS5qoi3QVE7N6byYirZB6KMAm
+sQJnF5pUVI5c7NmUvdqtcqWACFCsS4m7lTrASdwHtmnYlt9LwNrrDptlQcqO/LfM
+s/FoM2D+QJmgDulQiFTjZYzPM5Uz
+</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://client200-190.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://client200-190.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://client200-190.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-190.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-190.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-190.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Berglund</md:SurName>
+    <md:EmailAddress>mailto:andreas.berglund@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml b/swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml
deleted file mode 100644
index 476add71..00000000
--- a/swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-pd0001.ad.umu.se/shibboleth">
-  <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://its-pd0001.ad.umu.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Utvecklarmaskin för Tommy Larsson, ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Development workstate for Tommy Larss, ITS, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Utveckling av främst Wisum, Servicedesk och Sakai</mdui:Description>
-        <mdui:Description xml:lang="en">Development of Wisum, Servicedesk and Sakai</mdui:Description>
-      </mdui:UIInfo>
-      <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://its-pd0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <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://its-pd0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" 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://its-pd0001.ad.umu.se/Shibboleth.sso/KTH"/>
-      <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://its-pd0001.ad.umu.se/Shibboleth.sso/UMU"/>
-      <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://its-pd0001.ad.umu.se/Shibboleth.sso/ADFSTEST"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>its-pd0001.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=its-pd0001.ad.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+zCCAuOgAwIBAgIJAKPbW1ypIusOMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEdMBsGA1UEAwwUaXRzLXBkMDAwMS5h
-ZC51bXUuc2UxIzAhBgkqhkiG9w0BCQEWFHRvbW15LmxhcnNzb25AdW11LnNlMB4X
-DTE0MDMxODE0MzExNFoXDTE3MDEyOTE0MzExNFowgZMxCzAJBgNVBAYTAlNFMRUw
-EwYDVQQIDAxWYXN0ZXJib3R0ZW4xDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lU
-UzEMMAoGA1UECwwDSVRTMR0wGwYDVQQDDBRpdHMtcGQwMDAxLmFkLnVtdS5zZTEj
-MCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDiw8RQIeAq8SJUObzI3Bu9Dn8bRRXtJu9MGuvJ
-aZ/wM1X8vQ5Fk0WS90H/KYLCccRQGBH1VFMaS4eisNCVYNEMqv7Ru0H+SeAb5FbK
-UdmRcEPrTRIRVXX4TsxOhNKdvayKNJAqbItl/hnkBewDlWtbRjXXMJ3lxKNqjwYy
-7OSaYHKnHNer5CDf7c0vOcgCe6UlcGNr6WaJFPLJCw1PmRssGcNqr0STGYjDKK28
-lhX2iNwi6EdXfOpeUiZAxfVv8PBHDd7P2TVKQCbb9dV8goJtGvNE5rfWozWu5vfC
-j+vnXPm1C5b0FH7JswwJ4pABFJOi8GACnzI3FRHNkFYsciEBAgMBAAGjUDBOMB0G
-A1UdDgQWBBSuMS+XaurelGEYjr4KGqHRcX5zqTAfBgNVHSMEGDAWgBSuMS+Xaure
-lGEYjr4KGqHRcX5zqTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAh
-8LjMlEsd8rW/QY/Ct4idR/xkpqr9ZL77I2dP33Rf7KWmT0wA19XYQ0oQjQ1i/PG1
-rbAz5FzPwRhwnFKVf1qSnShXTpnIbVhSlEle6koZ0at3kzpJfRYmbnJHqSfuKbQw
-lxLc1UntmTXp8mDEH9UgOm49+VLfzdXrUwIV33yL+/z9uKqM1/moNrFo4kAD7NbZ
-WC/LBix0rbTW+p4pO7yGKV211XfQPfb+bGYfwiMji1um1jdlQCLHJexkMssCvNwv
-KYxBkgitKMxkEQUyT7VDiNBq6Pk32mH71aw5ApIdnv0wrNi4JDA/v5/wTbiFJty+
-42KAUCmS/mctLCZKYuA2
-</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://its-pd0001.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-pd0001.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-pd0001.ad.umu.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 93a63269..81646973 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -149,7 +149,6 @@
   <xi:include href="swamid-2.0/lingon.ladok.umu.se-8087-sp.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lpw.ki.se-shibboleth.xml"/>
@@ -657,4 +656,6 @@
   <xi:include href="swamid-2.0/dev-us.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/staging-us.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/us.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/client200-151.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/client200-190.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>