resolves SWAMIDOPS-6859

1 files changed, 16 insertions, 4 deletions

diff --git a/swamid-1.0/idp.suni.se.xml b/swamid-1.0/idp.suni.se.xml
index b79e81eb..a1ddae2b 100644
--- a/swamid-1.0/idp.suni.se.xml
+++ b/swamid-1.0/idp.suni.se.xml
@@ -1,4 +1,4 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" ID="_4fd38a7c-2e3a-4ebd-a93e-77cfd918c171" entityID="https://idp.suni.se/adfs/services/trust">

+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" ID="_c2877205-f46f-4d06-8b28-4679b1695e76" entityID="https://idp.suni.se/adfs/services/trust">

   <Extensions>

     <shibmd:Scope regexp="false">suni.se</shibmd:Scope>

   </Extensions>

@@ -6,7 +6,7 @@
     <KeyDescriptor use="encryption">

       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">

         <X509Data>

-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQXEjiNTWdtLROPwm4ilRMxjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBpZHAuc3VuaS5zZTAeFw0xMjA0MTMxMDAwMDhaFw0xMzA0MTMxMDAwMDhaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4BMwJfoPImmqhl0GXRWeUjkQ4f1f/bsvP7bWwCjCMRjjG2SJpWTljkvev0ikMXZNbf95R4trXxPifONKIqwYrahC18YEEnV0R5HIMK9iHmKDDDS4uyxMxrbsUkiN6BB1ws8C2obPru73QM7vGgMbjyal1S6sWQSitr87smCoLNU/o/5FjhuWul8+yQl9iJMt8V215249Z1Rns4RpOUg120VzN0DDZnOSH1elxCOgFs5ilS0oQ3cs8aEMZEV+xSM9kN7efFixt5JoEbsaLx1SS2UgTMWvKW/7hgrYbe4YpSURDhR8xsLtpcCQSN8u6c2IyxzVqdSIbdqOt/jiTXqV+QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBUtnjsLY5qQYZqxmibq5i4iQ69W4y+jh3GQPEW6hG9yFO/d42ylubftAK3ZNmbi0BLCzH29Oc7fUevoFr44L1Uegd/4TZMGbPY0F6WHgb2Ye8ItkD3tliFL5AerDNSbABEPKbFJtewQsLk/1ALt/FPb8ZClmL4LrJJzxlqPrEZeHZ3xl2PzvOlimdsGUAieiYMSjBhJItwcDn9zN4t38ULoTvj5ePBfzrkS65Z1XroV4BH3tuGzk7PyQFx+kpAGpvET3Ga+Pp8zlyfGrHMmvnhFYUAq9EtsEqDA2c3GKVrnSKm5mJ2a0nj2xq2K1pN5DSACB3NcRMzBnmRIb2FOOXj</X509Certificate>

+          <X509Certificate>MIIC2DCCAcCgAwIBAgIQfGgWejIsCo5L/IsIvUnfcTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBpZHAuc3VuaS5zZTAeFw0xMzAzMjQyMTExNTZaFw0xNDAzMjQyMTExNTZaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtxEBzEGsdM1UkdKbL1M/nEhXxR1/i8Sw2DP6uZML2iO6t1yfZHoxiziC1BCcF/3inQm/mvPgU3KlwHERjdmZMbfvD8vI+yyflWqB6iHsk2RylpdW0ROrQda//P/YYkElQJUQVvZQ7wZMrtsSQNwwnhXx/O5mIU3au4aoQznefJ/kTx4lpwCR7xnQpyjFtFrrNn/ublE5OC8vBQ/iQOQKWSWmOuChSjEX8IhKngKO+eU0xGdipH09OjnQspcdET3cXFuwnv6ul6PDLo3FDo6NquAjwyV+g1c7ogbOm404aHI3fKaQ6vq6wow3clTO14w+i7aT8KJZ/5TykIygRfTLsQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBQ2XltMk5K0e21pRs9e1qT+V7KeDdVqVQ0p9UOi2WAYgGkaWp04QJXFp5WssSRKIFZqzoGx4bZChuVIYa38jJT8FJMEWvv3aIIwsfbjHgJQeGHO+2K14/gjbrJe/HCbhNpzE/SSqLqvZ2FnhPuBACpOKeD74M194tQ528GGuHFJkVvXJDUxZaY9fD67WQxdI8wvXayGu+VXHh1xqWixdd0QZHHTqPY1W49zJWpVdmyU9FGfRgMY3pA0W2aVpNfeB2J1XdWQJvKVA/pEj43qJgbzO2eIgDnTMn8UvuDDwMZksQOXW478UVpOqZ/StQCUgF1A5L7bYzRX7HySX6+lcNN</X509Certificate>

         </X509Data>

       </KeyInfo>

     </KeyDescriptor>

@@ -17,14 +17,26 @@
         </X509Data>

       </KeyInfo>

     </KeyDescriptor>

+    <KeyDescriptor use="signing">

+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">

+        <X509Data>

+          <X509Certificate>MIIC0jCCAbqgAwIBAgIQEiQ+IOJRR4pMJkHVO0fu1jANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBpZHAuc3VuaS5zZTAeFw0xMzAzMjQyMTExNThaFw0xNDAzMjQyMTExNThaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqdy1oGrdKaRc5n08MdGT71Xb2qfvxE9vdLw2BBzi9g8MwuP6e59hHJJWYFthNHDGvFjEZZlXkcI1b+pOlq+XtAbIoYxEmJUQjWoRJZopN87DVB8Bf1i65cuaqlEmpfyR3C88Ic/8kXo1np/Tllzr3mezxoF65QWrwc6nw8lwanyLeoJ9BlfqHnaniyw7rPXdH3BSzIN26bmZ58U9nn+OIhxYs4NqLHAeY7lSC08R8A4JYCr0C0M3yZMCDHCs4B3PD6OpkQcnFf/vyb3wLtNpMKMLhKMQIYu5+N/gUPUvoVQEFdC5+neWYJl6kOED5isNnaSYVfr8/wr656ME20r+kwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAVIAMscei0J9p/yC7b9Y3F1pOxoEufy114w5TzxO5RQ5aS1CmqVg5yd66vExrGrYuJx52Rla6LSlJ/Fg/Uxv6RAesyUGIaTNYbE6uyfFnuh78I9BrM1M3fjOxhmV79Y3XwOtl0yzY8qW4z/O3Z/5J8VkLQ4crSEN9IkmHLTE5bU4PlFMi3PGR3zm/vkePAgjQ6FWY864l/zHmZbycDp90gJBBNVStYoNbAZsYAZEvGGZwyzOtly1C59KEZOXt+NUyStWKcPe7lbANh1Umu+ucrlDYZEqVTdAjcf2Q3NfK99aFlz1SZdV4tugyLEKsZtOgOeOadohiy9j1+3rojS0JR</X509Certificate>

+        </X509Data>

+      </KeyInfo>

+    </KeyDescriptor>

     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>

     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.suni.se/adfs/ls/"/>

     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>

     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>

     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>

-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>

     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.suni.se/adfs/ls/"/>

+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>

     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.suni.se/adfs/ls/"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Display Name"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumber"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumberNotOld"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>

@@ -35,7 +47,7 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>

-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNINOld"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>