From ddba1649410dc2eca5c3404b96b0a6e7f433bbce Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Fri, 6 Apr 2018 10:18:53 +0200
Subject: Resolved SWAMID-583

---
 .../confluence-test.its.uu.se-Shibboleth.sso.xml   | 123 +++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |   1 +
 2 files changed, 124 insertions(+)
 create mode 100644 swamid-2.0/confluence-test.its.uu.se-Shibboleth.sso.xml

diff --git a/swamid-2.0/confluence-test.its.uu.se-Shibboleth.sso.xml b/swamid-2.0/confluence-test.its.uu.se-Shibboleth.sso.xml
new file mode 100644
index 00000000..fff1cb7c
--- /dev/null
+++ b/swamid-2.0/confluence-test.its.uu.se-Shibboleth.sso.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://confluence-test.its.uu.se/Shibboleth.sso">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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://confluence-test.its.uu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence-test.its.uu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">IT-avdelningens Confluence (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division Confluence (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Confluence är ett samarbetsverktyg för team.</mdui:Description>
+        <mdui:Description xml:lang="en">Confluence is a team collaboration system.</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="34" width="250">https://confluence-test.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="34" width="250">https://confluence-test.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://confluence.its.uu.se/aboutconfluencepage.action</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>confluence-test.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=confluence-test.its.uu.se,O=Uppsala universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFHDCCAwQCCQC8gvZTSEZKwTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJT
+RTEcMBoGA1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEiMCAGA1UEAxMZY29uZmx1
+ZW5jZS10ZXN0Lml0cy51dS5zZTAgFw0xODA0MDMxNDU1NDZaGA8yMDczMDEwNDE0
+NTU0NlowTzELMAkGA1UEBhMCU0UxHDAaBgNVBAoTE1VwcHNhbGEgdW5pdmVyc2l0
+ZXQxIjAgBgNVBAMTGWNvbmZsdWVuY2UtdGVzdC5pdHMudXUuc2UwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDzVG+51wvzNSBeYp4gv6PI4wViCaQ+NWbc
+Uuom/fpdEUAg4QLNAbNih5m5hNIMQWP53+YfPFigkHbfuG+9J7buhCUfghH4Boh4
+TiMCgrsPHs4i0V1FqM1tk7NcgqU/BaYakbDIbk5UXDaSTcWFVS/IC3U0Dtf0+hP2
+sdXr64EpiI60ykCugNB4hqWTfS9EY7ik7ekGBzNx1g57A7269yBj7knept4IAD9j
+ANA8gdZ5lFIOk3rI4EoWXJRLeOpL8pLZ1/eIHtdE4lAjWI4SVI89gJ99VSkmGqDJ
+4F7BfIpnuBVUzmTXTCYW0cjR2vrlKlA27BvtPO0I3IwD5VHO3fZe+dW2fjTvxSsP
+UVbbz3qMzn18Hj5zgSTnypw1oo0f3jK4KEXnWeref02jhe3Mv0njnqfsVLharsa2
+HOV1ELoUhF/LJDqvKrtu4OSy60c82/CDUttYTqNFzAF1Z+9DWCnczwQNryM5/Kn+
+h9UlB/OGVeiCSuhYaG2wdXOF65ncGrk7L3+QLfWXpTESLu3eAENUlO7naeXcsvbs
+U/6tzJrxngwskEylN6v18vAXB8XJg1rnopyQKGQT7qBL4viGpo4Zuhcv86XfW/4V
+AcH7hlu+LbX2kehFR0G+7ryeO66hRVeBYNWEdIhv9Gu4KH+4UqOVzB3k4c2ldzdT
+hgkIDkqACQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBvUwVcRWwIqO+bPBeRwKiU
+xwfbjqIdYDAAI+GAM0kepYTgq6Y6rOBw5lCFmyUmadjPNUSbD6lS0dLXJEq+IasM
+BlCL3+cmu7aAIEHbpQOGXujXEbLv+1tcWR7Jdhi3Wn7TlIfvnAGDRQaGYOV8g0te
+g+B83pDJLbuQVrMt+5nyMgjjze7IQdfzeZF9LeWk4OvL1VtIfA3Ks0EbLKDK/5vK
+8+qQyMcw31DP8unHCm4i2T476nh5HgIIlFSgkJn7jjAyxhmFrLT7kFlfTPjyVtEU
+iMO/SMoJH5qPLFhPaIrF5A6XVWY+wq6LwmfDYVE0WB+qNnHavPmBTCyQ1koeRGA4
+rmHBdteEM+zvvFU3XXh6CyeJi/YboHSvOBGa3fwxxYyyqqA/sI93O7Z7sZdGkSlv
+PZKB4b551QFq/mnSbYBxmnccah6zNwP7v+S264BN5/m/nE6Sp0FNm7CznOpKjneK
+lAd7j/AaNwAahUbQUQPePTsZOKREE/byqzErigNr6N7Z/xXl1burRhVKenBizxhm
++4Lwwp8N+rS9lUOAZIOk9nsHivfjMuaJmbcghk2FQgmahx5g0ElWvCZ7Z5xvGj3F
+n//tIhpDkM6LQy1Mz2o39a/LPavKnBBEKY0rWIAi0EGxEC//qdnM+zWYaO/81bgv
+mo7jda5ck9hTxIWnp3G4OA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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 9d67c617..d64d54d0 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -693,4 +693,5 @@
   <xi:include href="swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml"/>
+  <xi:include href="swamid-2.0/confluence-test.its.uu.se-Shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3