2 files changed, 116 insertions, 30 deletions
diff --git a/swamid-2.0/ladok3-jenkins.ladok.umu.se-jenkins-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins.ladok.umu.se-jenkins-securityrealm-finishlogin.xml
new file mode 100644
index 00000000..4b32257b
--- /dev/null
+++ b/swamid-2.0/ladok3-jenkins.ladok.umu.se-jenkins-securityrealm-finishlogin.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-jenkins.ladok.umu.se/jenkins/securityRealm/finishLogin">
+  <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Inloggning Jenkins Ladok3</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok3 Jenkins login</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Inloggning mot Ladok3:s Jenkins</mdui:Description>
+        <mdui:Description xml:lang="en">Login to Ladok3 Jenkins</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIEJudoaDANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
+DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD
+VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzA5MjIzMVoXDTI3MDExMTA5
+MjIzMVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
+bm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIP8E+1UWC6THFR8PvNo6enlD9/cDwge
+DBcMZfSNExv6FsNAvForGr/P0WONMNHNgc6xl1FXxFubz4Ce0b6NyRsH5fIr59/ASc5t/jIS1z8z
+S2NOQC1ltRaSKYJTnBsiXKDLJPqFR4XtqN7TsUjLF6KRVfmx7FUhU9ccVONJxDstymN8sF1oGq2s
+LitZiVYb98ZPgILNFk0B064rhL2P65NQ0rZNzyvogp3uNexg+pxS2FyG26X136qbnmvAzJGbo5s/
+Rk2vW3CTEpPISvQW4kNlBDPz5S/epRa5bdJsGLHJkBJCKo0bTjzwg6/T19rSzrxdzt6tBD3vUzYX
+mhdgLSsCAwEAAaMhMB8wHQYDVR0OBBYEFPj1pmO/WxXRBHNpAsolfuhenJV6MA0GCSqGSIb3DQEB
+CwUAA4IBAQBRultcmx0OePrE+Q5m9bza3H9X9Nwn3vpfCQtg9VFhCfP1l4Kdy72cXXSKK+oRA1Zb
++221oO474dUxNQ8RlG9HaeNxGiUkyoYeHLfyIoU3zR+Sk1t1v9uEGvUG4ALmNdqJD5T0yNh+B029
+HkiecYTX5/KhlMSyQQyqd1TbssLdg/GM7hYmIWosanb1ueFkyv6gYyh6ZgZgza6tf63gjVvvYTog
+bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
++8sPLliD3nUprmKNJKgFYAni7n4fEGA27w+s19nQittHAwzu</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIEJudoaDANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
+DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD
+VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzA5MjIzMVoXDTI3MDExMTA5
+MjIzMVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
+bm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIP8E+1UWC6THFR8PvNo6enlD9/cDwge
+DBcMZfSNExv6FsNAvForGr/P0WONMNHNgc6xl1FXxFubz4Ce0b6NyRsH5fIr59/ASc5t/jIS1z8z
+S2NOQC1ltRaSKYJTnBsiXKDLJPqFR4XtqN7TsUjLF6KRVfmx7FUhU9ccVONJxDstymN8sF1oGq2s
+LitZiVYb98ZPgILNFk0B064rhL2P65NQ0rZNzyvogp3uNexg+pxS2FyG26X136qbnmvAzJGbo5s/
+Rk2vW3CTEpPISvQW4kNlBDPz5S/epRa5bdJsGLHJkBJCKo0bTjzwg6/T19rSzrxdzt6tBD3vUzYX
+mhdgLSsCAwEAAaMhMB8wHQYDVR0OBBYEFPj1pmO/WxXRBHNpAsolfuhenJV6MA0GCSqGSIb3DQEB
+CwUAA4IBAQBRultcmx0OePrE+Q5m9bza3H9X9Nwn3vpfCQtg9VFhCfP1l4Kdy72cXXSKK+oRA1Zb
++221oO474dUxNQ8RlG9HaeNxGiUkyoYeHLfyIoU3zR+Sk1t1v9uEGvUG4ALmNdqJD5T0yNh+B029
+HkiecYTX5/KhlMSyQQyqd1TbssLdg/GM7hYmIWosanb1ueFkyv6gYyh6ZgZgza6tf63gjVvvYTog
+bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
++8sPLliD3nUprmKNJKgFYAni7n4fEGA27w+s19nQittHAwzu</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-jenkins.ladok.umu.se/jenkins/securityRealm/finishLogin" index="0"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml b/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
index b052134b..d8111280 100644
--- a/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
@@ -12,8 +12,8 @@
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Inloggning Jenkins Ladok3</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 Jenkins login</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Inloggning Jenkins Ladok3 (old)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok3 Jenkins login (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Inloggning mot Ladok3:s Jenkins</mdui:Description>
         <mdui:Description xml:lang="en">Login to Ladok3 Jenkins</mdui:Description>
       </mdui:UIInfo>
@@ -21,44 +21,44 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIEJudoaDANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
+          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIERMR+4zANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
 DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD
-VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzA5MjIzMVoXDTI3MDExMTA5
-MjIzMVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
+VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzE0MDE1NVoXDTI3MDExMTE0
+MDE1NVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
 bm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIP8E+1UWC6THFR8PvNo6enlD9/cDwge
-DBcMZfSNExv6FsNAvForGr/P0WONMNHNgc6xl1FXxFubz4Ce0b6NyRsH5fIr59/ASc5t/jIS1z8z
-S2NOQC1ltRaSKYJTnBsiXKDLJPqFR4XtqN7TsUjLF6KRVfmx7FUhU9ccVONJxDstymN8sF1oGq2s
-LitZiVYb98ZPgILNFk0B064rhL2P65NQ0rZNzyvogp3uNexg+pxS2FyG26X136qbnmvAzJGbo5s/
-Rk2vW3CTEpPISvQW4kNlBDPz5S/epRa5bdJsGLHJkBJCKo0bTjzwg6/T19rSzrxdzt6tBD3vUzYX
-mhdgLSsCAwEAAaMhMB8wHQYDVR0OBBYEFPj1pmO/WxXRBHNpAsolfuhenJV6MA0GCSqGSIb3DQEB
-CwUAA4IBAQBRultcmx0OePrE+Q5m9bza3H9X9Nwn3vpfCQtg9VFhCfP1l4Kdy72cXXSKK+oRA1Zb
-+221oO474dUxNQ8RlG9HaeNxGiUkyoYeHLfyIoU3zR+Sk1t1v9uEGvUG4ALmNdqJD5T0yNh+B029
-HkiecYTX5/KhlMSyQQyqd1TbssLdg/GM7hYmIWosanb1ueFkyv6gYyh6ZgZgza6tf63gjVvvYTog
-bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
-+8sPLliD3nUprmKNJKgFYAni7n4fEGA27w+s19nQittHAwzu</ds:X509Certificate>
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJuHjYqu6jUCbj6JVxVlnnTa2qEwTsTn
+r5VUd5DT/++72+aCbx0RuzW7bR5hihEk91J+A3uA4NVTmZbKY8xqM1ALXHf3lyDDsA1eRyUk9Han
+9/tct9VHwryDscQtUhJt672s85cq65oHVBRrPoCRBoGqcTMCUHBrUGDOOKW862NzlxxX9RH6JKhN
+DqspuO5XYgYEaJfMagZSPQKdyko0Z18TIA3cKWautLIFkg/MbFn2C6sLutd6tLD0iBPd/fZ0j/wy
+9QM300eRLHK5HuVsaphCeNuOPJuTMHLNTqJ6dRTLnAa2IQv8cszd3cuytMtgsU347IcyplK5uYNC
+9Qz/El8CAwEAAaMhMB8wHQYDVR0OBBYEFICz8BXR9dOGx9j4DmL6qCSRh/dhMA0GCSqGSIb3DQEB
+CwUAA4IBAQBl1nw8qeEE3otWHJY1hNwmJiebvNQQWjFq16woCo6MBJI+lxCOwaJ+V+yefMBt6PQq
+x/hzgQMUoHaBjKFOsDUnf6DT27szdp3hkrOZsedBEKOkQLVxHGdHcvqkm2eQn3ZEJxyQJzViZNw3
+0xL/fZA8piBCzBp5sjdAK0xUk1PxIzXR/x/cn7KbnSwbL8utPCUYKkr5IXpGZbwFen9QhMW5Knbm
+59dH7LfpOzv+ID4gZ/aew21ldb5PFTBXZuesVZW8VCW6ddLtbbLNaRCkMuvjDHYIPh7nigN2LhrQ
+Zt9koo0LwqrO6JAc0XcB96E3f2td2FHdIzwOS/IbzLPX6lXA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIEJudoaDANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
+          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIERMR+4zANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdVbmtub3duMRAw
 DgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYDVQQKEwdVbmtub3duMRAwDgYD
-VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzA5MjIzMVoXDTI3MDExMTA5
-MjIzMVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
+VQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3duMB4XDTE3MDExMzE0MDE1NVoXDTI3MDExMTE0
+MDE1NVowbDEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5r
 bm93bjEQMA4GA1UEChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIP8E+1UWC6THFR8PvNo6enlD9/cDwge
-DBcMZfSNExv6FsNAvForGr/P0WONMNHNgc6xl1FXxFubz4Ce0b6NyRsH5fIr59/ASc5t/jIS1z8z
-S2NOQC1ltRaSKYJTnBsiXKDLJPqFR4XtqN7TsUjLF6KRVfmx7FUhU9ccVONJxDstymN8sF1oGq2s
-LitZiVYb98ZPgILNFk0B064rhL2P65NQ0rZNzyvogp3uNexg+pxS2FyG26X136qbnmvAzJGbo5s/
-Rk2vW3CTEpPISvQW4kNlBDPz5S/epRa5bdJsGLHJkBJCKo0bTjzwg6/T19rSzrxdzt6tBD3vUzYX
-mhdgLSsCAwEAAaMhMB8wHQYDVR0OBBYEFPj1pmO/WxXRBHNpAsolfuhenJV6MA0GCSqGSIb3DQEB
-CwUAA4IBAQBRultcmx0OePrE+Q5m9bza3H9X9Nwn3vpfCQtg9VFhCfP1l4Kdy72cXXSKK+oRA1Zb
-+221oO474dUxNQ8RlG9HaeNxGiUkyoYeHLfyIoU3zR+Sk1t1v9uEGvUG4ALmNdqJD5T0yNh+B029
-HkiecYTX5/KhlMSyQQyqd1TbssLdg/GM7hYmIWosanb1ueFkyv6gYyh6ZgZgza6tf63gjVvvYTog
-bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
-+8sPLliD3nUprmKNJKgFYAni7n4fEGA27w+s19nQittHAwzu</ds:X509Certificate>
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJuHjYqu6jUCbj6JVxVlnnTa2qEwTsTn
+r5VUd5DT/++72+aCbx0RuzW7bR5hihEk91J+A3uA4NVTmZbKY8xqM1ALXHf3lyDDsA1eRyUk9Han
+9/tct9VHwryDscQtUhJt672s85cq65oHVBRrPoCRBoGqcTMCUHBrUGDOOKW862NzlxxX9RH6JKhN
+DqspuO5XYgYEaJfMagZSPQKdyko0Z18TIA3cKWautLIFkg/MbFn2C6sLutd6tLD0iBPd/fZ0j/wy
+9QM300eRLHK5HuVsaphCeNuOPJuTMHLNTqJ6dRTLnAa2IQv8cszd3cuytMtgsU347IcyplK5uYNC
+9Qz/El8CAwEAAaMhMB8wHQYDVR0OBBYEFICz8BXR9dOGx9j4DmL6qCSRh/dhMA0GCSqGSIb3DQEB
+CwUAA4IBAQBl1nw8qeEE3otWHJY1hNwmJiebvNQQWjFq16woCo6MBJI+lxCOwaJ+V+yefMBt6PQq
+x/hzgQMUoHaBjKFOsDUnf6DT27szdp3hkrOZsedBEKOkQLVxHGdHcvqkm2eQn3ZEJxyQJzViZNw3
+0xL/fZA8piBCzBp5sjdAK0xUk1PxIzXR/x/cn7KbnSwbL8utPCUYKkr5IXpGZbwFen9QhMW5Knbm
+59dH7LfpOzv+ID4gZ/aew21ldb5PFTBXZuesVZW8VCW6ddLtbbLNaRCkMuvjDHYIPh7nigN2LhrQ
+Zt9koo0LwqrO6JAc0XcB96E3f2td2FHdIzwOS/IbzLPX6lXA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>