SWAMIDOPS-8417

3 files changed, 93 insertions, 54 deletions

diff --git a/swamid-2.0/indico.uu.se-shibboleth-sso.xml b/swamid-2.0/indico.uu.se-shibboleth-sso.xml
deleted file mode 100644
index b0b380c6..00000000
--- a/swamid-2.0/indico.uu.se-shibboleth-sso.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://indico.uu.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://uuc-web003-t.its.uu.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://uuc-web003-t.its.uu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
-        <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
-        <mdui:Logo height="52" width="196">https://indico.uu.se/images/logo_indico.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID6zCCAlOgAwIBAgIJAKx2XCsmViuCMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDGluZGljby51dS5zZTAeFw0xNjExMjQxMjQ5MjFaFw0yNjExMjIxMjQ5MjFa
-MBcxFTATBgNVBAMTDGluZGljby51dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBALjMMPXhMYcxfgSGSyfl+dSpnyOfYB7rFQQRy0ulOMAWrjOlLmtD
-QAfxsh/4liVGsJEBNx9P/nX9iwsp7HPlaUYszincN1oLp86RTovg0rvhUV8FQVB4
-9AvlPutKnxuI3cIwE4lbHlmk5qrTShyX1snPlYUEMmscW/naiWsXTRAbcUzG3FTo
-hfzluac6KN3zLp1Db/7atElFED0mFLYI0G/ANUCXbIsFJ8kMr/0rYSZ1fUVwqSCL
-T/l+8ft5ViEp8I7M7o8454LQGvMXZoCtQcdVfKWzaf44H6nhXFqnV8y/ZnUUdY4Y
-NZwPS9GcAsxyUd9UdVTHiVccCyf4pJEAGWPpjnxzervyACwDPk2mNWiVAoEVrWIY
-8c1qg5tPI+DSU6a3X9sx+SZsx58R/sinNnRzcIDrJ6egSibOfNd9kLW0fL/bctfy
-d3E0eQf+F7ctWedbrSiJHGK3wGwWlP+SulVTgxnTD11tEe5OyPxoiIBeZamjMPIM
-JQOmoeoIWWuh5wIDAQABozowODAXBgNVHREEEDAOggxpbmRpY28udXUuc2UwHQYD
-VR0OBBYEFP6PZrTeByfio/pWGzRr9jxz3nZ2MA0GCSqGSIb3DQEBCwUAA4IBgQBT
-9NM+TG9b7XcDxZ7PP09BJnbLyypdJaxwipcLFN/DrE133cQ84ngcBJrhN+IIpsQG
-tQH7k326CeOPURNFh/QrQoyvGx4aGawzmVyGjDKBa1DyIYMpiXlLc9AGAYNbTnH+
-1VwriPYuD91nzNz/IXDJhwBeSfztxs9GuBoxBQdRh0VmkTnDxD3zWf68pcdtDke1
-WX7mIGG5OIrJwwKEE7TVD2Ntvnn07VkYsC6OZGFl7xwmobezymHoCc14FXbUApSn
-xCbvpiqcEpHZGzPNB3bvBdglYiKFbvq95oYgHrVn2hsFx4b0Eu06aWCHdXO61n5Y
-81yET16MCeVzu/zece86QUX9TNapu/63XH3s00uC5rEMvwUnJRAwubGE4LESs364
-mBuS8hsaMu5++ZZgUiIVUSKRcMaoGOG4/qGni3P0IJlmSNPh08Ba3F3pPXbed3eO
-S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indico.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Wiberg</md:SurName>
-    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
new file mode 100644
index 00000000..edfd8d97
--- /dev/null
+++ b/swamid-2.0/indico.uu.se-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indico.uu.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://indico.uu.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://indico.uu.se/Sh ibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
+        <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+        <mdui:Logo height="52" width="196">https://indico.uu.se/images/logo_indico.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>indico.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=indico.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID6zCCAlOgAwIBAgIJAKx2XCsmViuCMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDGluZGljby51dS5zZTAeFw0xNjExMjQxMjQ5MjFaFw0yNjExMjIxMjQ5MjFa
+MBcxFTATBgNVBAMTDGluZGljby51dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
+ADCCAYoCggGBALjMMPXhMYcxfgSGSyfl+dSpnyOfYB7rFQQRy0ulOMAWrjOlLmtD
+QAfxsh/4liVGsJEBNx9P/nX9iwsp7HPlaUYszincN1oLp86RTovg0rvhUV8FQVB4
+9AvlPutKnxuI3cIwE4lbHlmk5qrTShyX1snPlYUEMmscW/naiWsXTRAbcUzG3FTo
+hfzluac6KN3zLp1Db/7atElFED0mFLYI0G/ANUCXbIsFJ8kMr/0rYSZ1fUVwqSCL
+T/l+8ft5ViEp8I7M7o8454LQGvMXZoCtQcdVfKWzaf44H6nhXFqnV8y/ZnUUdY4Y
+NZwPS9GcAsxyUd9UdVTHiVccCyf4pJEAGWPpjnxzervyACwDPk2mNWiVAoEVrWIY
+8c1qg5tPI+DSU6a3X9sx+SZsx58R/sinNnRzcIDrJ6egSibOfNd9kLW0fL/bctfy
+d3E0eQf+F7ctWedbrSiJHGK3wGwWlP+SulVTgxnTD11tEe5OyPxoiIBeZamjMPIM
+JQOmoeoIWWuh5wIDAQABozowODAXBgNVHREEEDAOggxpbmRpY28udXUuc2UwHQYD
+VR0OBBYEFP6PZrTeByfio/pWGzRr9jxz3nZ2MA0GCSqGSIb3DQEBCwUAA4IBgQBT
+9NM+TG9b7XcDxZ7PP09BJnbLyypdJaxwipcLFN/DrE133cQ84ngcBJrhN+IIpsQG
+tQH7k326CeOPURNFh/QrQoyvGx4aGawzmVyGjDKBa1DyIYMpiXlLc9AGAYNbTnH+
+1VwriPYuD91nzNz/IXDJhwBeSfztxs9GuBoxBQdRh0VmkTnDxD3zWf68pcdtDke1
+WX7mIGG5OIrJwwKEE7TVD2Ntvnn07VkYsC6OZGFl7xwmobezymHoCc14FXbUApSn
+xCbvpiqcEpHZGzPNB3bvBdglYiKFbvq95oYgHrVn2hsFx4b0Eu06aWCHdXO61n5Y
+81yET16MCeVzu/zece86QUX9TNapu/63XH3s00uC5rEMvwUnJRAwubGE4LESs364
+mBuS8hsaMu5++ZZgUiIVUSKRcMaoGOG4/qGni3P0IJlmSNPh08Ba3F3pPXbed3eO
+S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
+</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://indico.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indico.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indico.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Wiberg</md:SurName>
+    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f8b3efcd..9203e368 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -624,6 +624,6 @@
   <xi:include href="swamid-2.0/test.account.hj.se.xml"/>
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/indico.uu.se-shibboleth-sso.xml"/>
+  <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edumeta.sae.kau.se.xml"/>
 </md:EntitiesDescriptor>