From da331fcb1c88fbc0de003d948c4ae39b536112b5 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 19 Jun 2019 12:58:27 +0000
Subject: Resolves SWAMID-2274

---
 sp-with-simplesign                             |  1 -
 swamid-2.0/problem.math.su.se-shibboleth.xml   | 68 ----------------------
 swamid-2.0/utmanande.math.su.se-shibboleth.xml | 78 ++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                             |  2 +-
 4 files changed, 79 insertions(+), 70 deletions(-)
 delete mode 100644 swamid-2.0/problem.math.su.se-shibboleth.xml
 create mode 100644 swamid-2.0/utmanande.math.su.se-shibboleth.xml

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 485edd5f..1eade310 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -109,7 +109,6 @@ play.lu.se-shibboleth.xml
 portal.mdh.se-shibboleth.xml
 portalservices.miun.se-shibboleth.xml
 portalservicesutv.miun.se-shibboleth.xml
-problem.math.su.se-shibboleth.xml
 publications.ki.se-shibboleth.xml
 referens-idp.skolfederation.se-idp-shibboleth.xml
 samadhi.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/problem.math.su.se-shibboleth.xml b/swamid-2.0/problem.math.su.se-shibboleth.xml
deleted file mode 100644
index d94ba0ce..00000000
--- a/swamid-2.0/problem.math.su.se-shibboleth.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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://problem.math.su.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Externa kurssidor</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">External course pages</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kurssidor som riktar sig mot studenter utanför Matematiska institutionen.</mdui:Description>
-        <mdui:Description xml:lang="en">Course pages dedicated to students residing outside of the Mathematical institution.</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://problem.math.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
-      <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://problem.math.su.se/Shibboleth.sso/WAYF/idp.hig.se"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://problem.math.su.se/shibboleth</ds:KeyName>
-        <ds:KeyName>problem.math.su.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=problem.math.su.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKSK0oo3s8y6MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnByb2JsZW0ubWF0aC5zdS5zZTAeFw0xMzA1MjcxMjUwNDhaFw0yMzA1MjUx
-MjUwNDhaMB0xGzAZBgNVBAMTEnByb2JsZW0ubWF0aC5zdS5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALDdkgq2IazhunksULC0l93MzAIL04t81kRg
-ctcbk5Ytlp+KayUxevazYkQ+MMjNH1/DuAuYW2TBQ3C+aS0tBuRlwC3XrrKtu40I
-TcNYfwdvzDZ7ZTH81jKY8KDzMlCo6Lh5jkit6VHGanoamGIIQKm5JaXp12kOZAlw
-QozEjhzevlRQye1kS/BEEvQz2/lD7cbw1aayMgCNpsS41q45oei/WjFdRndK2AEa
-9zW+7C7EPw/RE2DeZSPv78FJ770AdUdeGrbPJY5DqQ101xz3T5s4RW6j7+tLswMM
-yE45EBHG1sJ/yw7fg3HGOvNUk30lwa/G+VWJ+KC3PgaLBGh7M/sCAwEAAaNnMGUw
-RAYDVR0RBD0wO4IScHJvYmxlbS5tYXRoLnN1LnNlhiVodHRwczovL3Byb2JsZW0u
-bWF0aC5zdS5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBRthQjSmK5vYAU2mFvUqVPI
-NIPN9TANBgkqhkiG9w0BAQUFAAOCAQEARp9dFh9cb3SigfGaKuUFdt8I356FHIom
-hQKk+5UlhWU13i0R+vs968VrT2V2A8t4RkEoASiTroegaqhISTGCnm82yX0sok43
-NLNFgjhZS2/V9heb/ui9TAmTuUa/tIHEypeSNwwSO54xdQtI5F7oI+6v479tyIKm
-4KlVSE1DqUTqJsei+jRYP000g8+Ooq69TEiSMnB9R+BSxW8iLTeiCjDVt2tkykF3
-u2jFiSjk4z1Jl6hxIqZfire7p7dzpvxXY/OnzKiG/4TBEc8xEMmSp/Huj6cPsUJt
-BYg6EHJWH+STzIe9LWWBS1ielXYFLLbSz38sMKEvtlZw5rnUbhXvhw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://problem.math.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://problem.math.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://problem.math.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://problem.math.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://problem.math.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://problem.math.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://problem.math.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://problem.math.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://problem.math.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://problem.math.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://problem.math.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://problem.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://problem.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://problem.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://problem.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/utmanande.math.su.se-shibboleth.xml b/swamid-2.0/utmanande.math.su.se-shibboleth.xml
new file mode 100644
index 00000000..91e4ece7
--- /dev/null
+++ b/swamid-2.0/utmanande.math.su.se-shibboleth.xml
@@ -0,0 +1,78 @@
+<?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://utmanande.math.su.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://utmanande.math.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <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://utmanande.math.su.se/Shibboleth.sso/WAYF/antagning"/>
+      <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://utmanande.math.su.se/Shibboleth.sso/WAYF/idp.hig.se"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Externa kurssidor</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">External course pages</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Kurssidor som riktar sig mot studenter utanför Matematiska institutionen.</mdui:Description>
+        <mdui:Description xml:lang="en">Course pages dedicated to students residing outside of the Mathematical institution.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>kurser3.math.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kurser3.math.su.se,O=Stockholms universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIRAJmPvLO1zhBHiC8cv0Ac0q8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDAxMTkwMDAwMDBaFw0xMzAxMTgyMzU5NTlaMEsxCzAJBgNV
+BAYTAlNFMR8wHQYDVQQKExZTdG9ja2hvbG1zIHVuaXZlcnNpdGV0MRswGQYDVQQD
+ExJrdXJzZXIzLm1hdGguc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDE0IybA6C3iZ+bkaClj4VPM+9ujYTq5UmpcUPr7ZovIHSrch5rRGSPuw3k
+MQ3dZz+1nBVCdtnbud4JwgJf+oKoHyixu5UAy4PosinJlVV+TeYHhDMB3J+O6O/7
+MVWCD7NUxgOXhwEIu1Ln9fbB2fyoH9czTgYUlz8IyBE1c5kbkU6dJ/v+TYFfYC6f
+QNTq/CKzuPPlG3I0b6fyMTF6+9BXnhGoqGzc4fbpDw466FLYbuBhwjYOGw4sHVOw
+NwZpeo1cSIZ+ynJCO4y3nLHx7Ln5yt48fkvDE8fhnDlP19hEKadctKYQzyt1X+WH
+uYPuy2bffW8LsGMNdz6zgV1yq29vAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU9/hl0fzcymppShwXt+2iss1P
+VA4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISa3Vyc2VyMy5tYXRoLnN1
+LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAtyWsUSktP5GxVj19xSNmFDyap7z0/igy4
+WCTNXDGmHPIOmZfaavo5UBtZwEUB1puU2ViognByPFW1dnZzNV+nIiCokKg9gEOG
+7gEOVIzGQZTGkX/EQYlyYkhXd+tQ2Mn7v60RxtHTpmLHutNZiuwXPV/T/pq+i6aT
+WkQUjdUtED1LYCNHIy/voAwYOa8zZ5tBq3kXRveZtY3LpdKRIz6aUkHqLKmHBLF4
+ImN8nJk/9yn1zCQW8/1DzycFt9IHU/zeCG1Q41L0EU2ZAXWixc/0sVuVxn6LEcIH
+cltjAaJBgU+QoDEuKsQtzVwmR/JfWYaVaMDXCh+QwOgvP3MIq8pA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://utmanande.math.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://utmanande.math.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utmanande.math.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://utmanande.math.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://utmanande.math.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://utmanande.math.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utmanande.math.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://utmanande.math.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://utmanande.math.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML2/POST" index="10"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Albin Niva Printz</md:SurName>
+    <md:EmailAddress>mailto:albin.printz@math.su.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a5e735bb..92da2979 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -36,7 +36,6 @@
   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml"/>
   <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml"/>
   <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/problem.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/selfservice.hb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/expert.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
@@ -632,4 +631,5 @@
   <xi:include href="swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-bth-staff-test.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-bth-stud-test.xml"/>
+  <xi:include href="swamid-2.0/utmanande.math.su.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3