Resolves 906 and 907

4 files changed, 0 insertions, 160 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index ecb78a53..f542a1d7 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -70,8 +70,6 @@ idp.test.antagning.se-aws-idp.xml
 its-pd0328.ad.umu.se-shibboleth.xml
 its-pd0030.ad.umu.se-shibboleth.xml
 its-pd0062.ad.umu.se-shibboleth-sp.xml
-jira-test.it.su.se-shibboleth.sso.xml
-jira.it.su.se-shibboleth.sso.xml
 kilw.ki.se-shibboleth.xml
 kilwdev.it.ki.se-shibboleth.xml
 kilwtest.it.ki.se-shibboleth.xml
diff --git a/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 6a8e9af8..00000000
--- a/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-test.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="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.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="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.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>jira-test-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-test-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALGCNK9nNxZDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtdGVzdC1hcHAxMB4XDTEwMDgyNjEyMzI1MloXDTIwMDgyMzEyMzI1
-MlowGTEXMBUGA1UEAxMOamlyYS10ZXN0LWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDO4PWB2RnZzDupQuf0rCArOypgHuDgHZxndiGjGQz80v2N
-3eYm7nPaJC9pTMZX8p6zhYw1CPRn+Gi8u53gRZKT2i7+drIBBHZPc1spTYLM4sUZ
-NlLWpaGfGLkRFfbq518xL6HGRRVmMcZlSAERhht6AqOxbfgoK88dihomUEnX4ANE
-wLbBJPHg/tERZnqjlwLF+Ftbpk9+Gfq9X7A5FSKo7Za+j6Puk1EzzzxqdmN60Jlf
-F9/T9eQh7zw3pJUKemh7/wp4zkNwkp7iyOhq1389QqUDFx74hZOQjFB60lm0z/Vp
-HFgq0nlvHOGE2cpTcq6MmFT3r8RFpTzft00y2QENAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtdGVzdC1hcHAxMB0GA1UdDgQWBBSL7ZJAZ3DDSKpgRMGXwhP9aNbZ
-7zANBgkqhkiG9w0BAQUFAAOCAQEAJtgLdreha5LTqtjQgQuXu+2l3iT2tHS0oX0I
-ZKcL+r2e3eSBY/r2maj4rI2y727zBQblf+slQBe0mAbBV0EGycgUiibukAQpIAze
-2I2EgrGBuWkFJJPGi71fOwiZFBJpHO2fSHc5wxEhgipRJrC4Es4TjZ2d2VbpAIC/
-zVshHJgtGbOSJmyi3OOih0YSwWX6sGWPNHEb7jKmfadfLreVEG30bVUDtxKy5tZA
-I0v8p/Tq2BIBdK6rTSh/5u2UVR52qJLh8Y7/+HG8DukTaEHWtPmLbuR3NZ2mWgdn
-SKTYQay0lG3RNe7C3dTRD2RvZznqpkhRVqNqWJHGdfuP4uiVfQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>jira-test-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-test-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALGCNK9nNxZDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtdGVzdC1hcHAxMB4XDTEwMDgyNjEyMzI1MloXDTIwMDgyMzEyMzI1
-MlowGTEXMBUGA1UEAxMOamlyYS10ZXN0LWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDO4PWB2RnZzDupQuf0rCArOypgHuDgHZxndiGjGQz80v2N
-3eYm7nPaJC9pTMZX8p6zhYw1CPRn+Gi8u53gRZKT2i7+drIBBHZPc1spTYLM4sUZ
-NlLWpaGfGLkRFfbq518xL6HGRRVmMcZlSAERhht6AqOxbfgoK88dihomUEnX4ANE
-wLbBJPHg/tERZnqjlwLF+Ftbpk9+Gfq9X7A5FSKo7Za+j6Puk1EzzzxqdmN60Jlf
-F9/T9eQh7zw3pJUKemh7/wp4zkNwkp7iyOhq1389QqUDFx74hZOQjFB60lm0z/Vp
-HFgq0nlvHOGE2cpTcq6MmFT3r8RFpTzft00y2QENAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtdGVzdC1hcHAxMB0GA1UdDgQWBBSL7ZJAZ3DDSKpgRMGXwhP9aNbZ
-7zANBgkqhkiG9w0BAQUFAAOCAQEAJtgLdreha5LTqtjQgQuXu+2l3iT2tHS0oX0I
-ZKcL+r2e3eSBY/r2maj4rI2y727zBQblf+slQBe0mAbBV0EGycgUiibukAQpIAze
-2I2EgrGBuWkFJJPGi71fOwiZFBJpHO2fSHc5wxEhgipRJrC4Es4TjZ2d2VbpAIC/
-zVshHJgtGbOSJmyi3OOih0YSwWX6sGWPNHEb7jKmfadfLreVEG30bVUDtxKy5tZA
-I0v8p/Tq2BIBdK6rTSh/5u2UVR52qJLh8Y7/+HG8DukTaEHWtPmLbuR3NZ2mWgdn
-SKTYQay0lG3RNe7C3dTRD2RvZznqpkhRVqNqWJHGdfuP4uiVfQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/jira.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 7799402a..00000000
--- a/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira.it.su.se/Shibboleth.sso">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>jira-prod-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-prod-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAKO40oiNNokAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtcHJvZC1hcHAxMB4XDTEwMDgyMzEwMDkwOFoXDTIwMDgyMDEwMDkw
-OFowGTEXMBUGA1UEAxMOamlyYS1wcm9kLWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDK1jIyprLcwZSC0tZxTwUerRm0igvgtt0WP5SeETSOtioh
-aBURLewSZ1Z+ea2WLaOIn6tW5jgKykVRcSMeaJ5JkW59KrzJo9+qJgJkd+izp4HF
-w3jSubP1Xo3OADW6Vf4LsH3FTIcFaGfWaAI0hfX2R+N4Llwwnci4l/0Yth65sZPH
-xufMzH7b/JJf1ZGHpVsYiX6VVz0QCZM5n4dLJUxwpdmR1IsyVmuABo9i130MlBjt
-Ot1aXWWf/XlhajMUkeuqFdEfpBqiBOSzV7nkRP7IAnxbzCE8z5hac5OAB+o8ueOu
-GztmeB/n+7lwOiN4MtqdoYlNpJRig42qIlwimtSDAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtcHJvZC1hcHAxMB0GA1UdDgQWBBQNbTCMshQI1Adr7JFGtx1Q8beG
-sTANBgkqhkiG9w0BAQUFAAOCAQEAN1YvkrZ45WXs56AUGcykmQ2m3YMjueiQP0Zt
-cyUJmJ6OMomhTA6eSoNvqv5h/g1dgVnF25wpsDhgwhJM1zgP6gArad02PfWrWVfx
-r/RrT2wGIYiqAnceTgtSJ7jbqKn2q2KZ6a4TKWiJDfYCPfA/ZLHgHanDCOaV8w12
-/JaEWVZldvm+MMLd9/pc8mr3TskEtunCs88mTT+xESt0alNJHnZX76ZPBQOVvzE9
-TSPz6L4JJM7OYEx92swJuDyjcGUWx6SHiumZtFh6t5FxlpIi2+bnV3iw9QP6M5dd
-FdYOem7PdnMNtROBFXZZ+vv1hrOfYBy7FrvBe49J9Yub+jaHWw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>jira-prod-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-prod-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAKO40oiNNokAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtcHJvZC1hcHAxMB4XDTEwMDgyMzEwMDkwOFoXDTIwMDgyMDEwMDkw
-OFowGTEXMBUGA1UEAxMOamlyYS1wcm9kLWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDK1jIyprLcwZSC0tZxTwUerRm0igvgtt0WP5SeETSOtioh
-aBURLewSZ1Z+ea2WLaOIn6tW5jgKykVRcSMeaJ5JkW59KrzJo9+qJgJkd+izp4HF
-w3jSubP1Xo3OADW6Vf4LsH3FTIcFaGfWaAI0hfX2R+N4Llwwnci4l/0Yth65sZPH
-xufMzH7b/JJf1ZGHpVsYiX6VVz0QCZM5n4dLJUxwpdmR1IsyVmuABo9i130MlBjt
-Ot1aXWWf/XlhajMUkeuqFdEfpBqiBOSzV7nkRP7IAnxbzCE8z5hac5OAB+o8ueOu
-GztmeB/n+7lwOiN4MtqdoYlNpJRig42qIlwimtSDAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtcHJvZC1hcHAxMB0GA1UdDgQWBBQNbTCMshQI1Adr7JFGtx1Q8beG
-sTANBgkqhkiG9w0BAQUFAAOCAQEAN1YvkrZ45WXs56AUGcykmQ2m3YMjueiQP0Zt
-cyUJmJ6OMomhTA6eSoNvqv5h/g1dgVnF25wpsDhgwhJM1zgP6gArad02PfWrWVfx
-r/RrT2wGIYiqAnceTgtSJ7jbqKn2q2KZ6a4TKWiJDfYCPfA/ZLHgHanDCOaV8w12
-/JaEWVZldvm+MMLd9/pc8mr3TskEtunCs88mTT+xESt0alNJHnZX76ZPBQOVvzE9
-TSPz6L4JJM7OYEx92swJuDyjcGUWx6SHiumZtFh6t5FxlpIi2+bnV3iw9QP6M5dd
-FdYOem7PdnMNtROBFXZZ+vv1hrOfYBy7FrvBe49J9Yub+jaHWw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1f270032..ba24e99a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -123,10 +123,8 @@
   <xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/jira.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mailfilter.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/connect.uninett.no-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dev.lobber.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ws3.bmc.uu.se-shibboleth.xml"/>