Resolves SWAMIDOPS-7214 Ny entityID, tilläg av tjänst som research-and-education plus fix to bad metadata in idp-test.kau.se

3 files changed, 81 insertions, 15 deletions

diff --git a/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml b/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
index 77ddce36..447321ca 100644
--- a/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
@@ -30,10 +30,10 @@ Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIJAKWCbaA+La6KMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xNDA0MTQxNTA3MTZaFw0xNzA0MTMxNTA3
 MTZaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -53,10 +53,9 @@ I6D7EogivsjADowMTNAq+rtlxhTUTlp4ntIc8N1jhLKetvPfwl/np3G+VHN2v5w8
 Izy0hXNev3Cjxtgj7mQS0EKO/6UOCuObXVcE41Iyep4=
 
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -95,10 +94,11 @@ Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIJAKWCbaA+La6KMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xNDA0MTQxNTA3MTZaFw0xNzA0MTMxNTA3
 MTZaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -118,9 +118,8 @@ I6D7EogivsjADowMTNAq+rtlxhTUTlp4ntIc8N1jhLKetvPfwl/np3G+VHN2v5w8
 Izy0hXNev3Cjxtgj7mQS0EKO/6UOCuObXVcE41Iyep4=
 
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
diff --git a/swamid-2.0/prep.math.su.se-shibboleth.xml b/swamid-2.0/prep.math.su.se-shibboleth.xml
new file mode 100644
index 00000000..25cfbe08
--- /dev/null
+++ b/swamid-2.0/prep.math.su.se-shibboleth.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://prep.math.su.se/shibboleth">
+  <md:Extensions>
+  <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="http://prep.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="http://prep.math.su.se/Shibboleth.sso/WAYF/idp.hig.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="http://prep.math.su.se/Shibboleth.sso/WAYF/antagning"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kurssidor för preparandkurser i matematik vid Stockholms universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Course pages for preparatory courses in mathematics at Stockholm University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Denna tjänst innehåller all kursinformation och platform för distanskurser på preparandnivå i matematik vid Matematiska institutionen, Stockholms universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">This service contains all course information and the platform for distance education on preparatory levels at the Department of Mathematics at Stockholm University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://prep.math.su.se/shibboleth</ds:KeyName>
+        <ds:KeyName>prep.math.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=prep.math.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAK72K4MqnS/dMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3ByZXAubWF0aC5zdS5zZTAeFw0xNDA0MTUxMTE0NTdaFw0yNDA0MTIxMTE0
+NTdaMBoxGDAWBgNVBAMTD3ByZXAubWF0aC5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANDab2hIEMf608kiyUJC8tC7y1dq3w5lKwnCpKD6AUVo
+1VM5Gt7abC4jt5CaLbQwsakNcb8Qm+c35YO2/CADKT5s0gp3ConaTmQVNYM1bvRB
+QXhqpuvfzxcHn7xtbioqWX3PYLk30HhS83td1H0rngjJTcywE3SSE86iYQouM2q1
+aQRUpedYWrgo0DJwLWjZ+rnSBDILNIzXYRnNCSLjn0M7QJqDWVzJJX4bXEupn3Y1
+zWqqhAsG+nlEDzEZnhLf/u93n4Jjphgt65rcwdo8bfShjZguup5G4Hy+Yj2v897d
+jRSocwPxg6rfzaKRzcgHp+4KHtfWnmwe7kHXpEGtx1cCAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPcHJlcC5tYXRoLnN1LnNlhiJodHRwczovL3ByZXAubWF0aC5zdS5zZS9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSGz51uU5UtBPWA2lTUhDEnZHkVrjANBgkqhkiG
+9w0BAQUFAAOCAQEAAfaDW9toxw42KRAG6NH5Ceq75VLo/ZnXihtsxnSwnvyRL7y0
+mbfT6KRbsEshtks6VEviveqMeztApAW3sxLYuxEqp02t+MpvDxgSul8gE0TmuxLj
+LURtA3TZX3WUL0Ja9wFbZJbqTOYmWCr0tOrVqf/f94wosnCQ58oYVCVGOK5ui6kl
+U81ZDK81QqZevvCVYTPgz8/AJMwHFLBid1io4WnF7boTACsHdt8UqO/FDmEK/UNR
+yIDoYWeNFIcknGHpVeDblXpZEbOFMlVFGLwntVBxrBjaS9XtFI05vWlAyAa20y4p
+pGb7MIeSW79eyk7seLTBvfcHQ/dHPtCq2wY20g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://prep.math.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://prep.math.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://prep.math.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://prep.math.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://prep.math.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://prep.math.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://prep.math.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://prep.math.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://prep.math.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://prep.math.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://prep.math.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://prep.math.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://prep.math.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://prep.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://prep.math.su.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 2b5cef9a..15418393 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -293,4 +293,5 @@
   <xi:include href="swamid-2.0/samltest.swamid.se-r_and_s-sp.xml"/>
   <xi:include href="swamid-2.0/dirg.org.umu.se-443-sp.xml"/>
   <xi:include href="swamid-2.0/activate-test.du.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/prep.math.su.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>