SWAMID-1018 updates rehab.uu.se

3 files changed, 60 insertions, 45 deletions

diff --git a/swamid-2.0/rehab.uu.se-TicketServer-.xml b/swamid-2.0/rehab.uu.se-TicketServer-.xml
new file mode 100644
index 00000000..4bec4180
--- /dev/null
+++ b/swamid-2.0/rehab.uu.se-TicketServer-.xml
@@ -0,0 +1,58 @@
+<?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://rehab.uu.se/TicketServer/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-19T18:01:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Adato Rehab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Adato Rehab</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets system för rehabiliteringsärenden.</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University system for workplace rehabilitation.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=594622498&amp;l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=594622498&amp;l=en</mdui:InformationURL>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=767069827&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=767069827&amp;l=sv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDqDCCApACCQCYZVibRnPytjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCU0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExHDAaBgNVBAoME1VwcHNhbGEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsMA1VJVDEUMBIGA1UEAwwLcmVoYWIudXUuc2UxIDAeBgkqhkiG9w0BCQEWEXNlcnZpY2VkZXNrQHV1LnNlMB4XDTIxMDQxNjEyNTQ0M1oXDTQ2MDQxMDEyNTQ0M1owgZUxCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdVcHBzYWxhMRwwGgYDVQQKDBNVcHBzYWxhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANVSVQxFDASBgNVBAMMC3JlaGFiLnV1LnNlMSAwHgYJKoZIhvcNAQkBFhFzZXJ2aWNlZGVza0B1dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHP61fB010kXutw0CzcvDA6Z8eIayEF26QdILSBn/wwuLahIun3BlpyHM7rxMaB4jpKaFLdKJ9F5d4ON5WQn3KdrG6IU/8ZAfqAGQMYeegtaiXvSRvfoRVjQvDhmREXw/rrrhAkajg20jKQ5M6ALB7VakhRwNPLcuDUq/BwMv7/A6cccxep1jyp2EYmjC+hAu2aFvHvYZQUPtukkYrJ9l1NthQwldRVQScULZt7cVOsnlqE5Sv9j6c8NtT9ILGx7SQYqDj6utUV7cK9NnEkXLJiGvV1+Vr5pMVrChvafunVvpRsdfUDN1UuqYFNR/otaU8FjIro+k/CvwQ3WOMqR98CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAwXEiY76PJ9tmDBhn4YTj3Ct1OVKIgXqCs+I9DG4CkCDUJceqSA5mZFiERsG0FBYQxjmKmM+JBEPyF0Q8EK1W3Dbo643RuuPOw59C488TbprNVnzeysUNIo6/TFan004TXfZ/pa/HDuJxP+pMeN8cJvcLFHdmvLi5Y1aJrStM4os68TMNu4dRadAjUsnWURKPozOG5eioWEWcBTLfqc/elpMAM7DCHh2SSxaENlZ3eRlYlUq+I9rtmMWeYG4mgrDBTNpt5shMo75vvRERtG95jl8TBCJiHZjp4DVqDgzbJa0wzH+OdyffbVvoHaSQYDTBY118ngc9R+QNgvtQqqu0EA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rehab.uu.se/TicketServer/SAML/SAMLAssert.aspx" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>HR-avdelningen</md:GivenName>
+    <md:EmailAddress>mailto:hr-ufv@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Grupp system Windows</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HR-avdelningen</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/rehab.uu.se-ticketserver-.xml b/swamid-2.0/rehab.uu.se-ticketserver-.xml
deleted file mode 100644
index e03c71ad..00000000
--- a/swamid-2.0/rehab.uu.se-ticketserver-.xml
+++ /dev/null
@@ -1,43 +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://rehab.uu.se/TicketServer/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-19T18:01:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Adato Rehab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Adato Rehab</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets system för rehabiliteringsärenden.</mdui:Description>
-        <mdui:Description xml:lang="en">Uppsala University system for workplace rehabilitation.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=594622498&amp;l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=594622498&amp;l=en</mdui:InformationURL>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDqDCCApACCQCYZVibRnPytjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCU0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExHDAaBgNVBAoME1VwcHNhbGEgdW5pdmVyc2l0ZXQxDDAKBgNVBAsMA1VJVDEUMBIGA1UEAwwLcmVoYWIudXUuc2UxIDAeBgkqhkiG9w0BCQEWEXNlcnZpY2VkZXNrQHV1LnNlMB4XDTIxMDQxNjEyNTQ0M1oXDTQ2MDQxMDEyNTQ0M1owgZUxCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdVcHBzYWxhMRwwGgYDVQQKDBNVcHBzYWxhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANVSVQxFDASBgNVBAMMC3JlaGFiLnV1LnNlMSAwHgYJKoZIhvcNAQkBFhFzZXJ2aWNlZGVza0B1dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHP61fB010kXutw0CzcvDA6Z8eIayEF26QdILSBn/wwuLahIun3BlpyHM7rxMaB4jpKaFLdKJ9F5d4ON5WQn3KdrG6IU/8ZAfqAGQMYeegtaiXvSRvfoRVjQvDhmREXw/rrrhAkajg20jKQ5M6ALB7VakhRwNPLcuDUq/BwMv7/A6cccxep1jyp2EYmjC+hAu2aFvHvYZQUPtukkYrJ9l1NthQwldRVQScULZt7cVOsnlqE5Sv9j6c8NtT9ILGx7SQYqDj6utUV7cK9NnEkXLJiGvV1+Vr5pMVrChvafunVvpRsdfUDN1UuqYFNR/otaU8FjIro+k/CvwQ3WOMqR98CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAwXEiY76PJ9tmDBhn4YTj3Ct1OVKIgXqCs+I9DG4CkCDUJceqSA5mZFiERsG0FBYQxjmKmM+JBEPyF0Q8EK1W3Dbo643RuuPOw59C488TbprNVnzeysUNIo6/TFan004TXfZ/pa/HDuJxP+pMeN8cJvcLFHdmvLi5Y1aJrStM4os68TMNu4dRadAjUsnWURKPozOG5eioWEWcBTLfqc/elpMAM7DCHh2SSxaENlZ3eRlYlUq+I9rtmMWeYG4mgrDBTNpt5shMo75vvRERtG95jl8TBCJiHZjp4DVqDgzbJa0wzH+OdyffbVvoHaSQYDTBY118ngc9R+QNgvtQqqu0EA==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rehab.uu.se/TicketServer/SAML/SAMLAssert.aspx" index="0" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>HR-avdelningen</md:GivenName>
-    <md:EmailAddress>mailto:hr-ufv@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Grupp system Windows</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HR-avdelningen</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8d348163..915171fd 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -599,7 +599,8 @@
   <xi:include href="swamid-2.0/pilot.drive.sunet.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/datalab.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/hrm.flexhosting.se-hrm-.xml"/>
-  <xi:include href="swamid-2.0/rehab.uu.se-ticketserver-.xml"/>
+  <xi:include href="swamid-2.0/rehab.uu.se-TicketServer-.xml"/>
+  <xi:include href="swamid-2.0/rehab.test.uu.se-TicketServer-.xml"/>
   <xi:include href="swamid-2.0/visp.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/stage.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tse-uu.sitevision.se.xml"/>
@@ -691,5 +692,4 @@
   <xi:include href="swamid-2.0/account.mdu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edusign-test.test.hb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www7.kau.se-.xml"/>
-  <xi:include href="swamid-2.0/rehab.test.uu.se-TicketServer-.xml"/>
 </md:EntitiesDescriptor>