Resolves SWAMIDOPS-545

3 files changed, 118 insertions, 57 deletions

diff --git a/swamid-2.0/jira-test.its.uu.se-shibboleth.sso.xml b/swamid-2.0/jira-test.its.uu.se-shibboleth.sso.xml
new file mode 100644
index 00000000..aa58c266
--- /dev/null
+++ b/swamid-2.0/jira-test.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-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://jira-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://jira-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 JIRA (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT Division JIRA (TEST)</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-test.its.uu.se/images/logoJIRAPNG.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="108" width="211">https://jira-test.its.uu.se/images/logoJIRAPNG.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://jira-test.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>its-app008-t.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=its-app008-t.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFCzCCAvOgAwIBAgIJALkdzkWs2PLDMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
+BAMTFml0cy1hcHAwMDgtdC5pdHMudXUuc2UwIBcNMTgwMjE0MTMwODEwWhgPMjEw
+MDAxMjUxMzA4MTBaMCExHzAdBgNVBAMTFml0cy1hcHAwMDgtdC5pdHMudXUuc2Uw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJFMiuqKyqg0F1niJ2v4DR
+E8lusxIBI628739RWSDWhEFzBGAeU9RFd4V7gcGlsaKQJBpiRfMuUnda9Iqxc720
+rB4mFuSIGREU9flxAHDX2FYbhaQY3KRnJhQon19e4T1MkaLE/Kwet/GPQtzmM4a7
+tWQftN4VZW+F0L0n6AaKfxCz498fp5/LsYntPoVWmZMaaNIHtrcoRicapjDklcTj
+5P8d1Sg174OyJrLphstQzdo8mLJ2EAxkbbLTTfYoaUAgrUTjvdPgY7CyP2JQBCvD
+SQtTZdQ47khCvkst0CcL11Jr9z7aCjh94kCc4R0ICAAsyINJ5/j4sZO7BOX/AxzI
+p/FqgZ6h2JqdSPgbKO/rXHvbxvEgGpvIRUjpEMXQCmBtFMx7G0CN9aMsMwqu/VC9
+L1ao4x/77ri5jYg1WLC4s4D42oCai/CFlywoAyGXzyejfYl6e4eXyfQlbwycgXLp
+YiQ3DRDULhkE69oVhWZd0VkhurV+2k0It40cxf15MAOaMaSEqbmHO/xH+hA24h8p
+G95ioOpmkZ/pQcoD0HwXtzBn4G6x5i1T/Lq2LQ/BiC9CFFiTVeZkcDLKqJcT1syK
+5o32eBQoWUXlXZnoHlsClqf2a4ahlpy1JUPPdKUizt+lcuq7zqT772qFqrSXQsLv
+rCsjwIMU/CCCXSPT1Ol8hwIDAQABo0QwQjAhBgNVHREEGjAYghZpdHMtYXBwMDA4
+LXQuaXRzLnV1LnNlMB0GA1UdDgQWBBTjEwmVJG9+Ilkh6uE00DOx9DrsejANBgkq
+hkiG9w0BAQsFAAOCAgEAlBtwGB4fJVtdnN6whihLtUO6bqOm9WDhWNYRYOY1KCPu
+0FWjkXE93JOrYFXANG6nMWHKiB/+XhIeZkCXDkasbe6GqcnDyYSxRjM6oIOYKrwc
+4ZhJqeHBIk5t2zEeBqtIx+H0eO0tGzSW+RzV3csnNn9cUw3X4v6PlgMb3t9807Wq
+I+RhKGFdgLnMit8kUst6t4rtApJBer8Zf0ulX29pgTsoFM8LuMcH1URj6Kux5XKe
+VgP6joEagWrlhHYdutz59QXP8XEKyckhfr6CkAWfK77eJ9EAImiOLCKNXyJr82tB
+IVt3WOWiKRwun71B0s56Dq8sNoWxZpEJpP6h/Fy2el78WHN0beUgSpNP/g4A6Mi0
+/Sz7UZWk14dHo9eFXFYzsZIYiPEIjjBw7Rh/QyUosLoElnAihYWNfyxNJwTQIzWw
+PTUToKhMNx0okDmgKeVidhUaMSBZ23LauwUDwsFl4s0j2I3Z6cEgkQR8PbvAh4VW
+Py/FEnDaQgPXALRwJ4HS8M/Xc+lRtK4P1YWquFX6WKoaBqQnJ7r3+wV3O4r3H6DQ
+lF4YWadQfiBR6+cUQmPrGttaZ8Z+NUgyW5pY5C5ofx03b2Jt0jscH32DXK+RzZ+/
+uWha1n71XCbqdNegjx3kBJM4v/b9q4DZuao/X/VfqngFwJIrvJgj4tinlbQqrkg=
+</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-test.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-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://jira-test.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-test.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-test.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-test.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-2.0/jira-test.its.uu.se-shibboleth.xml b/swamid-2.0/jira-test.its.uu.se-shibboleth.xml
deleted file mode 100644
index 2b46993e..00000000
--- a/swamid-2.0/jira-test.its.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,56 +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="jira-test.its.uu.se/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <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">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFCzCCAvOgAwIBAgIJALkdzkWs2PLDMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
-BAMTFml0cy1hcHAwMDgtdC5pdHMudXUuc2UwIBcNMTgwMjE0MTMwODEwWhgPMjEw
-MDAxMjUxMzA4MTBaMCExHzAdBgNVBAMTFml0cy1hcHAwMDgtdC5pdHMudXUuc2Uw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJFMiuqKyqg0F1niJ2v4DR
-E8lusxIBI628739RWSDWhEFzBGAeU9RFd4V7gcGlsaKQJBpiRfMuUnda9Iqxc720
-rB4mFuSIGREU9flxAHDX2FYbhaQY3KRnJhQon19e4T1MkaLE/Kwet/GPQtzmM4a7
-tWQftN4VZW+F0L0n6AaKfxCz498fp5/LsYntPoVWmZMaaNIHtrcoRicapjDklcTj
-5P8d1Sg174OyJrLphstQzdo8mLJ2EAxkbbLTTfYoaUAgrUTjvdPgY7CyP2JQBCvD
-SQtTZdQ47khCvkst0CcL11Jr9z7aCjh94kCc4R0ICAAsyINJ5/j4sZO7BOX/AxzI
-p/FqgZ6h2JqdSPgbKO/rXHvbxvEgGpvIRUjpEMXQCmBtFMx7G0CN9aMsMwqu/VC9
-L1ao4x/77ri5jYg1WLC4s4D42oCai/CFlywoAyGXzyejfYl6e4eXyfQlbwycgXLp
-YiQ3DRDULhkE69oVhWZd0VkhurV+2k0It40cxf15MAOaMaSEqbmHO/xH+hA24h8p
-G95ioOpmkZ/pQcoD0HwXtzBn4G6x5i1T/Lq2LQ/BiC9CFFiTVeZkcDLKqJcT1syK
-5o32eBQoWUXlXZnoHlsClqf2a4ahlpy1JUPPdKUizt+lcuq7zqT772qFqrSXQsLv
-rCsjwIMU/CCCXSPT1Ol8hwIDAQABo0QwQjAhBgNVHREEGjAYghZpdHMtYXBwMDA4
-LXQuaXRzLnV1LnNlMB0GA1UdDgQWBBTjEwmVJG9+Ilkh6uE00DOx9DrsejANBgkq
-hkiG9w0BAQsFAAOCAgEAlBtwGB4fJVtdnN6whihLtUO6bqOm9WDhWNYRYOY1KCPu
-0FWjkXE93JOrYFXANG6nMWHKiB/+XhIeZkCXDkasbe6GqcnDyYSxRjM6oIOYKrwc
-4ZhJqeHBIk5t2zEeBqtIx+H0eO0tGzSW+RzV3csnNn9cUw3X4v6PlgMb3t9807Wq
-I+RhKGFdgLnMit8kUst6t4rtApJBer8Zf0ulX29pgTsoFM8LuMcH1URj6Kux5XKe
-VgP6joEagWrlhHYdutz59QXP8XEKyckhfr6CkAWfK77eJ9EAImiOLCKNXyJr82tB
-IVt3WOWiKRwun71B0s56Dq8sNoWxZpEJpP6h/Fy2el78WHN0beUgSpNP/g4A6Mi0
-/Sz7UZWk14dHo9eFXFYzsZIYiPEIjjBw7Rh/QyUosLoElnAihYWNfyxNJwTQIzWw
-PTUToKhMNx0okDmgKeVidhUaMSBZ23LauwUDwsFl4s0j2I3Z6cEgkQR8PbvAh4VW
-Py/FEnDaQgPXALRwJ4HS8M/Xc+lRtK4P1YWquFX6WKoaBqQnJ7r3+wV3O4r3H6DQ
-lF4YWadQfiBR6+cUQmPrGttaZ8Z+NUgyW5pY5C5ofx03b2Jt0jscH32DXK+RzZ+/
-uWha1n71XCbqdNegjx3kBJM4v/b9q4DZuao/X/VfqngFwJIrvJgj4tinlbQqrkg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-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://jira-test.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Benjamin</md:GivenName>
-    <md:SurName>Lefoul</md:SurName>
-    <md:EmailAddress>mailto:benjamin.lefoul@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ra21.mnt.se-shibboleth.xml b/swamid-2.0/ra21.mnt.se-shibboleth.xml
index 18d7498e..8b60583d 100644
--- a/swamid-2.0/ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/ra21.mnt.se-shibboleth.xml
@@ -76,7 +76,6 @@ ms8tx3iM9oau6D9QCQVufFQNd3iDGA==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ra21.mnt.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>