Resolves SWAMIDOPS-7339

3 files changed, 49 insertions, 48 deletions

diff --git a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 8c8f7cbe..00000000
--- a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,47 +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://goldings.sae.kau.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <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://refeds.org/category/research-and-scholarship</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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Logga in i Inslaget - Karlstads universitet intranät</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Login to Inslaget - Karlstad University intranet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är Karlstads universitets nya intranät baserad på Drupal Commons</mdui:Description>
-        <mdui:Description xml:lang="en">This is the new intranet at Karlstad University based upon Drupal Commons</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDjzCCAnegAwIBAgIJALtHeuJsxCOyMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRwwGgYDVQQDDBNnb2xkaW5ncy5zYWUua2F1LnNlMB4XDTE0MDQxNjEyNTgyNloXDTI0MDQxNTEyNTgyNlowXjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEthcmxzdGFkMR4wHAYDVQQKDBVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxHDAaBgNVBAMME2dvbGRpbmdzLnNhZS5rYXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmptaPwHBQZHE0tWrTdW7jaZHE2KqsiT51tqc+u5D11NcXbz3pd9OeVUHZLASoMhqtzCBx0zW3Zuf8h66CHA4naprYrilNkg6QZN7QzNxB/kXs8HwoVEYM5ME9ha7QoqEgxWQFD1QQ8spWw4GtBP9rdPfmvzsQcNjlFWjwGFU+COwRNgsdJOtesuTu295Nl3vcxHfVlyivHoFAp/RbpvEeQuYxhsNA6713cMhgsrR4U4lL5tPvMpsyhm+otP8M60jc8IV5J6Dddc7kTAwOwCsQxVb6W43Gh6AT8sDHX5ZLaKnjv4xXeVDqPQsOJuKBpMx7MYjbhrPcud7Cqu3CzLK1AgMBAAGjUDBOMB0GA1UdDgQWBBSYW2MjQouZr2jAhzjWfJisj0vzqDAfBgNVHSMEGDAWgBSYW2MjQouZr2jAhzjWfJisj0vzqDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAIK4RRAM2H5RKrkj6kO5E+sEu1y6t/VuL8PBBT05tUlDIIau+tOGu170TRQcXzkNYqvrtzHcN/u9fS1gWefB45uyx3eI2eoF4LGbSTxsnrNvRskbebxXetF2IGFe48HuuZgZ4Noc8a1ux8f+8OeBchOxhrir2XIQV4BqrhEiRRVG6/tU3RXnl98W+bR1bgAwm5T8AxzpHoNImepat59qV+tWa/wPOWTlivpfpgebxaAk4VHxa7yWquxcLvbhP12FWu9F9lW1FPHJz3D1R21CYY3xRH25yRQc9l8LfJq4WqaKo6k0EZCi86PenfN2JWmCRCBn2K7XGbYDhJ9icmdF4R</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDjzCCAnegAwIBAgIJALtHeuJsxCOyMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRwwGgYDVQQDDBNnb2xkaW5ncy5zYWUua2F1LnNlMB4XDTE0MDQxNjEyNTgyNloXDTI0MDQxNTEyNTgyNlowXjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEthcmxzdGFkMR4wHAYDVQQKDBVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxHDAaBgNVBAMME2dvbGRpbmdzLnNhZS5rYXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmptaPwHBQZHE0tWrTdW7jaZHE2KqsiT51tqc+u5D11NcXbz3pd9OeVUHZLASoMhqtzCBx0zW3Zuf8h66CHA4naprYrilNkg6QZN7QzNxB/kXs8HwoVEYM5ME9ha7QoqEgxWQFD1QQ8spWw4GtBP9rdPfmvzsQcNjlFWjwGFU+COwRNgsdJOtesuTu295Nl3vcxHfVlyivHoFAp/RbpvEeQuYxhsNA6713cMhgsrR4U4lL5tPvMpsyhm+otP8M60jc8IV5J6Dddc7kTAwOwCsQxVb6W43Gh6AT8sDHX5ZLaKnjv4xXeVDqPQsOJuKBpMx7MYjbhrPcud7Cqu3CzLK1AgMBAAGjUDBOMB0GA1UdDgQWBBSYW2MjQouZr2jAhzjWfJisj0vzqDAfBgNVHSMEGDAWgBSYW2MjQouZr2jAhzjWfJisj0vzqDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAIK4RRAM2H5RKrkj6kO5E+sEu1y6t/VuL8PBBT05tUlDIIau+tOGu170TRQcXzkNYqvrtzHcN/u9fS1gWefB45uyx3eI2eoF4LGbSTxsnrNvRskbebxXetF2IGFe48HuuZgZ4Noc8a1ux8f+8OeBchOxhrir2XIQV4BqrhEiRRVG6/tU3RXnl98W+bR1bgAwm5T8AxzpHoNImepat59qV+tWa/wPOWTlivpfpgebxaAk4VHxa7yWquxcLvbhP12FWu9F9lW1FPHJz3D1R21CYY3xRH25yRQc9l8LfJq4WqaKo6k0EZCi86PenfN2JWmCRCBn2K7XGbYDhJ9icmdF4R</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goldings.sae.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT-avdelningen</md:GivenName>
-    <md:EmailAddress>webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
new file mode 100644
index 00000000..7486691a
--- /dev/null
+++ b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
@@ -0,0 +1,48 @@
+<?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://inslaget.kau.se/simplesaml/module.php/saml/sp/metadata.php/inslaget-sp">
+  <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://refeds.org/category/research-and-scholarship</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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Logga in i Inslaget - Karlstads universitet intranät</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Login to Inslaget - Karlstad University intranet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Karlstads universitets verktyg för internkommunikation, nyhetsspridning och samarbete</mdui:Description>
+        <mdui:Description xml:lang="en">This is Karlstad University's web platform for internal communication, news distribution and collaboration</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAJMImyFGqAAxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRgwFgYDVQQDDA9pbnNsYWdldC5rYXUuc2UwHhcNMTQwOTA1MDgwNDI3WhcNMjQwOTA0MDgwNDI3WjBaMQswCQYDVQQGEwJTRTERMA8GA1UEBwwIS2FybHN0YWQxHjAcBgNVBAoMFUthcmxzdGFkcyB1bml2ZXJzaXRldDEYMBYGA1UEAwwPaW5zbGFnZXQua2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+tDRtU67sGbCSFF6nU1PFnHosthULIN3s/KgLaX44LYlz2roZ9twHOlwYMgIvEEybhMQGAw1q1ewbXensGoCoSEgFwiHL2TrSAip/xh9X5PUtj3XPnpKq7Y5D6wcCwcoFCaij1mibhTIVGZQqvBQR3rSE0jLaJ2us+5HoEk3uUDRpaM3RduCgfO1QJfRpWbSw0y9tAaO8LM89QS06x6qVIMZgWI583s8S3kIS5v9NKOqS5Fnv4ETq9xNqfQIE7IyDFtAgY9vLU+J+vxJVGoM4teRZY+Dn5HpqMBVgNwpKuXjSJ9uHEs980qv9dVwJ5rSeCOXNXlGH7J6oTtGf1cRdwIDAQABo1AwTjAdBgNVHQ4EFgQUyHpSJZGARlwiPVPX+ik5n/7zYKwwHwYDVR0jBBgwFoAUyHpSJZGARlwiPVPX+ik5n/7zYKwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOJYpdSPLf4XnrWnCdKiGuQKCL1YY5lMfd64YmpC9LiwmRtZ5KBV7tV62kPjqDavemu2ZudllbanvZXlYBNtE1xnJmX5a9d0OOfSIh9SysIs34aJuLvzkpkWpRYRSyTW/SjFcNc3xOBqzsJlIkXTjffHQjyeQtMo12u7pkOgyULlg2wco/wN4jvCCPuYncGGeFv4e7h/jyPhczyvV0ZS9oGk8l09RUlBRFRGvgmgwOMWft6JNYpf+NZGojjluuqPSDxOr6CO6d7iUbnW+pWy3DPfbBYIzF+tA7Ka9K28OM66/2aq4Fh/zokF2GOR/+/5sbL/gZYKPvkiEtxMtga8eAw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAJMImyFGqAAxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhLYXJsc3RhZDEeMBwGA1UECgwVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRgwFgYDVQQDDA9pbnNsYWdldC5rYXUuc2UwHhcNMTQwOTA1MDgwNDI3WhcNMjQwOTA0MDgwNDI3WjBaMQswCQYDVQQGEwJTRTERMA8GA1UEBwwIS2FybHN0YWQxHjAcBgNVBAoMFUthcmxzdGFkcyB1bml2ZXJzaXRldDEYMBYGA1UEAwwPaW5zbGFnZXQua2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+tDRtU67sGbCSFF6nU1PFnHosthULIN3s/KgLaX44LYlz2roZ9twHOlwYMgIvEEybhMQGAw1q1ewbXensGoCoSEgFwiHL2TrSAip/xh9X5PUtj3XPnpKq7Y5D6wcCwcoFCaij1mibhTIVGZQqvBQR3rSE0jLaJ2us+5HoEk3uUDRpaM3RduCgfO1QJfRpWbSw0y9tAaO8LM89QS06x6qVIMZgWI583s8S3kIS5v9NKOqS5Fnv4ETq9xNqfQIE7IyDFtAgY9vLU+J+vxJVGoM4teRZY+Dn5HpqMBVgNwpKuXjSJ9uHEs980qv9dVwJ5rSeCOXNXlGH7J6oTtGf1cRdwIDAQABo1AwTjAdBgNVHQ4EFgQUyHpSJZGARlwiPVPX+ik5n/7zYKwwHwYDVR0jBBgwFoAUyHpSJZGARlwiPVPX+ik5n/7zYKwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOJYpdSPLf4XnrWnCdKiGuQKCL1YY5lMfd64YmpC9LiwmRtZ5KBV7tV62kPjqDavemu2ZudllbanvZXlYBNtE1xnJmX5a9d0OOfSIh9SysIs34aJuLvzkpkWpRYRSyTW/SjFcNc3xOBqzsJlIkXTjffHQjyeQtMo12u7pkOgyULlg2wco/wN4jvCCPuYncGGeFv4e7h/jyPhczyvV0ZS9oGk8l09RUlBRFRGvgmgwOMWft6JNYpf+NZGojjluuqPSDxOr6CO6d7iUbnW+pWy3DPfbBYIzF+tA7Ka9K28OM66/2aq4Fh/zokF2GOR/+/5sbL/gZYKPvkiEtxMtga8eAw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/inslaget-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/inslaget-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/inslaget-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/inslaget-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/inslaget-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/inslaget-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Scott</md:SurName>
+    <md:EmailAddress>paul.scott@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b3c447e4..81627301 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -268,7 +268,6 @@
   <xi:include href="swamid-2.0/grouper.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml"/>
-  <xi:include href="swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/lartorget.sll.se-shibbolet.xml"/>
   <xi:include href="swamid-2.0/hr.liu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accounts.bils.se-saml2-metadata.xml"/>
@@ -312,4 +311,5 @@
   <xi:include href="swamid-2.0/its-pd0243.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogon.ltu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>
 </md:EntitiesDescriptor>