obsolete devel sp replaced with new one

SWAMIDOPS-7316

2 files changed, 95 insertions, 59 deletions

diff --git a/swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml b/swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..bb1b769c
--- /dev/null
+++ b/swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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" entityID="https://its-pd0243.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"/>
+  </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-pd0243.its.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-pd0243.its.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-pd0243.its.umu.se/Shibboleth.sso/SU"/>
+      <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-pd0243.its.umu.se/Shibboleth.sso/KI"/>
+      <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-pd0243.its.umu.se/Shibboleth.sso/Loginy"/>
+      <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-pd0243.its.umu.se/Shibboleth.sso/Loginx"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Utvecklarmaskin för Olov Höglund, ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Development workstation for Olov Hoglund, ITS, Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utveckling av främst Servicedesk och ADFS</mdui:Description>
+        <mdui:Description xml:lang="en">Development of Servicedesk application and ADFS</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>its-pd0243.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=olov.hoglund@umu.se,CN=its-pd0243.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIID+zCCAuOgAwIBAgIJAO0C37kikt+EMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEeMBwGA1UEAwwVaXRzLXBkMDI0My5p
+dHMudW11LnNlMSIwIAYJKoZIhvcNAQkBFhNvbG92LmhvZ2x1bmRAdW11LnNlMB4X
+DTE0MDgyMDA2MDM1MFoXDTE3MDcwMzA2MDM1MFowgZMxCzAJBgNVBAYTAlNFMRUw
+EwYDVQQIDAxWYXN0ZXJib3R0ZW4xDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lU
+UzEMMAoGA1UECwwDSVRTMR4wHAYDVQQDDBVpdHMtcGQwMjQzLml0cy51bXUuc2Ux
+IjAgBgkqhkiG9w0BCQEWE29sb3YuaG9nbHVuZEB1bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDEJjAAtMcLWFzkaxFLzzaLuq9ofPdVV5myt33h
++QJw2NSdZ20okuDJSqZPl1bvaDjMDpUXr0ZcJOG8yfACONCTsQ0tT7gaVsnKnZzL
+NSGAF9y0LoK3fiHfYpBE68zPidBS68i7x6fIvATUtEkm8YfbCLTTFqJ/+7ubexDg
+vHVutOBcLrWp2vuX68t6C6Ci/9+SJLLJ7MBahBQqBA+5HRB6MEPAslhUsDmUOtCN
+9HmMJLAAbNVSSDdca2uHWCyj5lQ0vQtApQ4QJEhoPm1q4FTC+abjresUzKmdRSog
+OqQNTGcAxfxiwcFhRH1Ev9h3MxdqoIKTV2ciWgBzVii0UOafAgMBAAGjUDBOMB0G
+A1UdDgQWBBQmbF7b9TbjNUQEw4YyGmGKfxB2HzAfBgNVHSMEGDAWgBQmbF7b9Tbj
+NUQEw4YyGmGKfxB2HzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA7
+SWzr3GMHqSRTaJQ++9ZpgmjcYEd3N7T1LFt1PlPy/sjpCwR4Y7BxFzjxR+4drtOs
+g8ZNYb1j1jx0OI1argiL6fHqvqfVGzihEPxdWEY83ewkZoUd+kGP5fCtRqTnjoAO
+6c22xEHvEvH2tpDeS9voRd/X+6i2pU0S2G/8fwhI5Mo81nC8I6JukdbR10Z2eldM
+H6CiTAXVx8zGKI9/1w0paMJyUVhHD+pYTebZrQd7CbZ/F5P8EhP7s8lUb5BtlCuD
+WzpbQSb/6vmdDbH3lTuWCMMrYZXYmS1QCcLVd1G2VaUhb2ThAC+6PMWQB0OggOax
+79H2Yw28W8Q9+HnLTqe2
+</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-pd0243.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-pd0243.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml
deleted file mode 100644
index 40fbb8f7..00000000
--- a/swamid-2.0/umdac-olho0001.ad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-olho0001.ad.umu.se/shibboleth">
-  <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://umdac-olho0001.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://umdac-olho0001.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://umdac-olho0001.ad.umu.se/Shibboleth.sso/SU"/>
-      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/KI"/>
-      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/Loginy"/>
-      <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://umdac-olho0001.ad.umu.se/Shibboleth.sso/Loginx"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>umdac-olho0001.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=olov.hoglund@adm.umu.se,CN=umdac-olho0001.ad.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAK3Ixi4wEKOLMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEhMB8GA1UEAwwYdW1kYWMtb2xobzAw
-MDEuYWQudW11LnNlMSYwJAYJKoZIhvcNAQkBFhdvbG92LmhvZ2x1bmRAYWRtLnVt
-dS5zZTAeFw0xMTA1MTkwODQzMTNaFw0xNDA0MDEwODQzMTNaMIGaMQswCQYDVQQG
-EwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQwwCgYD
-VQQKDANJVFMxDDAKBgNVBAsMA0lUUzEhMB8GA1UEAwwYdW1kYWMtb2xobzAwMDEu
-YWQudW11LnNlMSYwJAYJKoZIhvcNAQkBFhdvbG92LmhvZ2x1bmRAYWRtLnVtdS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/WaqpHa41juTzDaZs4
-3FZXOXqSTtZWoI2h4/1xr619liNbZ2eJ+Dlwpjde0hyqiQ+xbMxVvMbn/6LF5Zsp
-JoNofugOMUXieKj/OiP8S35QjuOQaNIUIW102NoRsx1pqdQUYjaqg4UG/c5gyZRu
-iDff6F6lnSsnKUpWkDHDcLdknQ0pTdNlhmlR2YSoy8D2twr/SdQfih0IVbL6WLw9
-bB7T05+jxEuiAsAeDFPGnT8hHowQgHlMmRGjQ/cRRBbuMFxxfH8rB5PHe63TBxMl
-sGzQgGgqqbxn/lRiVGUcFSDbPrO5G4ndkKrz5bwwDoqCE8tJkfbEwmzfvlb6Lvcz
-BMMCAwEAAaNQME4wHQYDVR0OBBYEFLXDc99280S72ej+9ADMJPXy/HkqMB8GA1Ud
-IwQYMBaAFLXDc99280S72ej+9ADMJPXy/HkqMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADggEBALFQR+c3B/yoY0RSvcGW3GV4clryvVjDQehTsg8BrnSafuU3
-v86B38Gqrf75rm8Zrs/cm/rpcmibdTDi7EObUUrHMlRBFaaoSxwqDRNGlYhVLx6t
-iEm749FD8yau5/85er7//3a+LFEsaid4G/3jCjyVO2bmZPERrqlk2QaHhpJwmVnL
-QiOVXEI5kZcLh82asMMKOOWkm/mEaguFOXWksUSOmk1bOUxZPkY0eTtIdqyHPuBv
-3BjkPojMH6Ixwv0vluO26w1ZwOYqw6plU5n7D1tJ9YdJ6DAQjeDUXmdrgqS8Dpw9
-yJ87d7WXKCfNlolR2zh8rlXP5N2pv2MV8UsBuPY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-olho0001.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://umdac-olho0001.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://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-olho0001.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>