Resolved SWAMID-625 och SWMAID-626

3 files changed, 243 insertions, 0 deletions

diff --git a/swamid-2.0/confluence.its.uu.se-shibboleth.xml b/swamid-2.0/confluence.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..afb35490
--- /dev/null
+++ b/swamid-2.0/confluence.its.uu.se-shibboleth.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.its.uu.se/shibboleth">
+  <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.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.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</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division Confluence</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.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="34" width="250">https://confluence.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.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=confluence.its.uu.se,O=Uppsala universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEjCCAvoCCQDhKJMbzYc3ODANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJT
+RTEcMBoGA1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEdMBsGA1UEAxMUY29uZmx1
+ZW5jZS5pdHMudXUuc2UwIBcNMTgwNDAzMTQ1NjI3WhgPMjA3MzAxMDQxNDU2Mjda
+MEoxCzAJBgNVBAYTAlNFMRwwGgYDVQQKExNVcHBzYWxhIHVuaXZlcnNpdGV0MR0w
+GwYDVQQDExRjb25mbHVlbmNlLml0cy51dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMCISWcGJfUZuo9u5tpkGGI/+NB/kkiA10LIL21+vo4ZeHst
+QE+Tflwgi7uI5carzaL4YVv3QdNQcQRfPaacablpI6A7c1aece6hxBKNaKF9D0P+
+z+d04OKSINkMvoKV6ZzrjPVrDB7pXjiTcX6SPvcbEpmUXNslsQ61ecp2XUlpCoxW
+luAegghkLukOFPIVoI1ESntIEAXz/qXjQPQnjIC7arpihBgFhSQJALoHlDHAxd78
+POEgd/ULHfnhELP28zx8c0Ljk/emu3LdoOdHiGKL/EX7Dm3y6FbMXPDbrfUFMlVw
+L/UcNq8OqdLmvCx5d9kdTTWJ48Vd6BO/lCBRbyvJ3r20ItuxJCX3zAbeUS1OR9ZW
+cbxVNxFo4azHsbYq2mhso2nGa3l6BisP50O/UQaouECkoG8adQh6pK4L7cVqC+IP
+D4RwibxgzZSh7eD177Ws6V7zf1bdx0nUWLM/7f0bfJzU2Q9PDlWbDX+4LlFHOoNZ
+Y6G8AVyrEs8V43kTFwTBRdXz2CLCU4hqP1F2cFmDcrODIEhyXMnm9jZ4vci3WwpN
+U44bFf4DHLUS5nfh90sn90NzoaUhhnkS8mqIjN8O0ERu4ybvxlcUgRKCiVlI0bjU
+HQcz12UvvjcgHsU1bHSJdmDUXgTyu+UetkX5GmncPyQweWNKMdY31uvQqKDzAgMB
+AAEwDQYJKoZIhvcNAQELBQADggIBAIrnGRTiLnaijmndgyFLsLK2MZk48M9aeRTa
+FPjq4IrfPI37/NO3/1TYWGvAMPaza6MiiCF/t+Wbbcp1juVQuOZG5sMFLuOdDt8u
+DJHhZT1QaQAx91mIfcA3bADblPUiTUgl2M/ofJ6LKhh1vC7PwIU25TbaSzzRmpVK
+wbtiufy5HHc43X+dLeJewzHKQVUN9Njvm2ssmRkBU45f+7hQTMz3mKK7+NIMxtA+
+3c5YRQhoBftUTWdMW+3qTcYVn/ztgmB/t0JbpGz15kbMfg81zyZQuVgaMRiSII5h
+utlzzaRzMEoBgwHRcpCT/A9JnEgqODhohd3Iyqa444r5tQcMPVU2NTkwOypPqIn7
+6dAuQyEdivshQCUuF6v9gt2vhI2CzMBmKOX7/t5xgq6c9U6W0cP/Zc64LPwTRlRJ
+abjZnR4ZqJZMosBiyO9iNGk90BebhF0BMrQ4V0hVKLq9owlFnyt+bMtY1MC5u7Dc
+KAX4Jq/XMwz52e6wSUDGP6ZmDNAqLJpBlcXjmmUiWjvTG7YECb+/MU4GDMftxA32
+osrr2DF9rxMBxal1Cy8aPDpjTGJqHcntFAdwvS6xHaFpUFUuvYgiue2gK1am72O2
+NvygAelCu4wABd7/kAbOkIDwN9+HmD98TjSBNhPwvQrvH8OdBTRsquI6bqynyL0P
+GpYW8E7+
+</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.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.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.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.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.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.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-2.0/jira.its.uu.se-Shibboleth.sso.xml b/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
new file mode 100644
index 00000000..76b4d054
--- /dev/null
+++ b/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira.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://jira.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://jira.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 JIRA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division JIRA</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">JIRA är ett ärende- och projekthanteringssystem.</mdui:Description>
+        <mdui:Description xml:lang="en">JIRA is an issue tracking and project management system.</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="108" width="211">https://jira.its.uu.se/images/logoJIRAPNG.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="108" width="211">https://jira.its.uu.se/images/logoJIRAPNG.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://jira.its.uu.se/secure/AboutPage.jspa</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>jira.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=jira.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE8zCCAtugAwIBAgIJAM88i1ym5SRFMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+BAMTDmppcmEuaXRzLnV1LnNlMCAXDTE4MDQyMDEyMTMwNloYDzIxMDAwMzMxMTIx
+MzA2WjAZMRcwFQYDVQQDEw5qaXJhLml0cy51dS5zZTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAMgYUQapar/bHlhCuypIKgB9dPOpM6Hfm0J2vNehPKO1
+eRuyYKasVoXUMy1k6JgwK8OUcX/Z0arfhr2hZ9EMk5YrbuVq47bNFOBkikNzJ2BZ
+Y/ra0xJGOaMujJTHtdBby2L0SFpJtOMVZBh5pFnDnWNidiw6OfQaUQ40tvaEfOZI
+CWyLo7SStGk7FZ7tKZJndJKsQqQ6CRZqAqd9cWs5E3/zzlp6uwaeqwT+9K7vQx31
+b4zytKD9I/6DNgKUKP16cb4rD3CJAPGAasPIOvV2R3ZXGcV9bRnwLBTzYVkNZigy
+Q7fTw+baDQtb6D0B1OW8ePEGg2s31fad/zyUPtuTYa0SdCttbx6QsntAj+Gz9CC5
+kqQdJ6an36BSowpHqec9nlaWlB+q30FiHexeH/JMOL3/GmTCSWkdf9M8mlMMfMVn
+IJ7obACIoOTZaYogaJ7SWkYVTcfBbCCFkurAzQ+DFUVC/Kjp0leMoUSxtsUaL9F4
+YZnYL0picWbDnDM/TPN7F/fvTozZMgQTVqd3dHefn+WrFuw+Tq+BL9CvwQ1tspD1
+n+TmNaJ0YUVAmPkksjq7VBuEzF2vCjwuu9XZCOKgVBQP5ZI+mRerpIfjlq3p2k5h
+IqcEJEPA19yfm4uiEDT8MXbsF43qlp1+5noFWsNKY17bPQoDoDMTbHBTHBRWuJd1
+AgMBAAGjPDA6MBkGA1UdEQQSMBCCDmppcmEuaXRzLnV1LnNlMB0GA1UdDgQWBBRd
+VaTxrlw3e4aBiaJ8Lwx0GNQ5LjANBgkqhkiG9w0BAQsFAAOCAgEAtBllY4NrLO85
+vhbjZuVB1E3/iF+R4tXPCr0weWdDNWu+YXXjIO3EgejfI2cA0ESPrGCvHHbMpZup
+a4o+eiT2E6aGJP+9mqa2NirCxlGAUaepaiA+5YUF65lk0vHUNJZl9VEnVu795aRt
+XGF2TNZjA0qTlUUxfsvXya/NA53cnSobl8SHJZ/HNW+iBgNTokVJ1m1FVZldEZ4q
+f0RTkXmZD6PD2mPivP4ngoFXK1HMlFTNy3qZ0p8uLz6SG5ARpHf6z8GZtkkgZNBk
+9ZR8JIhXV8xQytwC3Qof4JYoRufdhS8bDWW1wk/pg02GkzTUcuuarkQ2yObA73is
+1czZyGCMU53NCrp+zT2DWcUDD+pGUNaOWfCQWrCTLar+hNwSLciJ/d9s5zYDYZ0V
+TtVjjuHOJqFF+mihhrK2ja9SyiWnYExPgUXZwrsEPuJI8FfqrbHU3nIhqti3fW6g
+VUzsAlJ2PA3WwBpNZNoqGWeaxyR2/BPK3qi9aVmqVV0gv+kVvCnWzE2LwX379rKy
+YXyuJ7/7oeLpKDoal0SrW6b5pCCs5DU7xE20RW7ez5P36WL5XPzUY9NTjiKZgDSd
+U5AETOMMoTnJdA9/jkaK7+TbmcoHo0DgN2OdtAnZfHwbpvwxCNaGys4nfx+4ghrd
+9L4ilqceh6N3OvpDYdfx4QE6gHC+dfo=
+</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://jira.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </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 a343e012..611187e9 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -700,4 +700,6 @@
   <xi:include href="swamid-2.0/test-hh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/300-mediaspace.kaltura.nordu.net.xml"/>
   <xi:include href="swamid-2.0/websrv01.testad.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/confluence.its.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>