Resolved SWAMID-2022

4 files changed, 162 insertions, 4 deletions

diff --git a/swamid-2.0/wiki.its.uu.se-shibboleth.xml b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
index 95c252e2..2f593bf8 100644
--- a/swamid-2.0/wiki.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
@@ -4,10 +4,10 @@
     <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://wiki.its.uu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">IT-avdelningens Wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IT Department Wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division Wiki</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki</mdui:Description>
-        <mdui:Description xml:lang="en">The internal Wiki for the IT Department at Uppsala University</mdui:Description>
+        <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -41,8 +41,28 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.its.uu.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184714400</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..fd6f906c
--- /dev/null
+++ b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki2.its.uu.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://wiki2.its.uu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki (RESERV)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division Wiki (BACKUP)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki (RESERV)</mdui:Description>
+        <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University (BACKUP)</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
+ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
+lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
+VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
+MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
+xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
+KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
+HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
+WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
+T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
+TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
+d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
+XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
+oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184714400</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..a1578586
--- /dev/null
+++ b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wikiu.its.uu.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://wikiu.its.uu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division Wiki (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki (TEST)</mdui:Description>
+        <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University (TEST)</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
+ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
+lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
+VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
+MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
+xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
+KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
+HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
+WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
+T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
+TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
+d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
+XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
+oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikiu.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikiu.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikiu.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184714400</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index df68a57f..d32f1914 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -617,4 +617,6 @@
   <xi:include href="swamid-2.0/kau.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/test.valda.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.vemendo.net-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/wikiu.its.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>