1 files changed, 69 insertions, 33 deletions
diff --git a/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml b/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
index b343b505..96cbec7d 100644
--- a/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
+++ b/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
@@ -19,45 +19,81 @@
         <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIETjCCAragAwIBAgIJAJcLyHdonAWdMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
-BAMTHHYyLmRhc2hib2FyZC5zdG8xLnNhZmVkYy5uZXQwIBcNMjAxMTMwMTYyODE5
-WhgPMjA1MDExMjMxNjI4MTlaMCcxJTAjBgNVBAMTHHYyLmRhc2hib2FyZC5zdG8x
-LnNhZmVkYy5uZXQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCs2Sll
-UpybtYoyfa8jGQSXwIbz27wEUQ+eD7S64rQrd65WsBgaLA6KisFRqvAGc+XZ4Kp1
-Gy5/Z23RE3h0PeoWLHl3BSwXfVLqr2d6xPfH0ypde1LurU+4nidGxSwDTdmWJShG
-0aMT8xRXpQ1l0DlXRwfOsqMlbE2IEkuJpaRbqpmicg9rxIxndPBOAgK0MxettlLR
-hOfBAn51Tbk+ltJKHbEyOPRv/4iu3kDtnG/2GELGieSJdKsTBpM5RPDHgZfrfB61
-X67g7XP51qM9SrNpGTO2pgaf2yLIeA30f6doQJRPPYZRBUYjEqmCkKPe0Xa4bFjO
-g4mOq8mrbJaofQB621cPo+jJRYHYpoHqbbPs4x6uWnWcHH5IUCMgsFD26qM5BR+i
-YZJkTsTt1pK89gMXnCQZMTk4sqKxwqQurIhAvZeL1puxcR5FM0crCriIv8R2l0LI
-LZA3xcyrCWcrhtQsIrbKm3i1xBbqT8SgjRY8e3mgnKOgeHQrdTivYv0clEkCAwEA
-AaN7MHkwWAYDVR0RBFEwT4IcdjIuZGFzaGJvYXJkLnN0bzEuc2FmZWRjLm5ldIYv
-aHR0cHM6Ly92Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0L3NoaWJib2xldGgw
-HQYDVR0OBBYEFDziH9/zY4tiJEr6XoFfdGV6819wMA0GCSqGSIb3DQEBCwUAA4IB
-gQAMzU05TMuosKoO3oVn1QSymfdL/Rj7sDuzbo024gBdjKL0H2RUGneS2iU4umdX
-kOGquRm4ZfVjuz2WTy/OnuJDoPIV/ehbAT0PivAe/2DCbKtiZ7UkIm4mRsEOe6Qg
-MVpueXEPs4mf5NTHaagh6fgC9afEHIaVSqup+wMZF/lSgz0CAuO3qCXC8KZRnAsj
-ZK+OWe5+XUkYyftCzLq0aOyjTkvU6vJeCpru/IB7aNudnfFrAEdyD5c2o8lbWmP4
-My8DMv7Qeg7KqZ/DeXm5Dk3sOLtvB6ki90jNNUrw24iFMfZ6P17RxLjLefxJ6eTS
-XrvbpH27EA4wHk5VKn9PSWXyxaxv+cEUSEBTCFeWq10/kZ+n/eknlXeZUknaK7kx
-w9OzqKa9I5LyupRo/4WhPJvEaKSniSfUxHHSC9wT6nz2SUoqGPOHPtyk5JVL9sxO
-F/QhYLMLru1u9EaRCpzt8XLKhNqE9nm+T7jywkxHuoMcNUvSOD8TqdrEv+dMMIKA
-TH8=
+            MIIETjCCAragAwIBAgIJAPVEvfMcAesUMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
+            BAMTHHYyLmRhc2hib2FyZC5zdG8xLnNhZmVkYy5uZXQwIBcNMjAxMTMwMTYyMjA1
+            WhgPMjA1MDExMjMxNjIyMDVaMCcxJTAjBgNVBAMTHHYyLmRhc2hib2FyZC5zdG8x
+            LnNhZmVkYy5uZXQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDHGOIh
+            rRbb4zExgy6E1wRhaOlGfNVleXGy+KeRz22A0AzEQeV6bek2uOP8qDwU2QEPAKYs
+            EW6v9FBAd1/1iTQBkLs+QOQRMJR1idHSCqNbP3lo3GxXdCBuTlasVf/CDsO5bh33
+            OaraUdQ4xmBY1zZrPA8xq7Y2J1uwq3tCGuvETjey4d+O+Jtjm2RbbVocb9Hq94fJ
+            3kAAf4rzuR+qGXuqVaX97R4luZ8+DTDGV9NA7mBrIa0i24vU3n16NUThoos9UotJ
+            DjqHiCxF7OxqRdG0PUxdSnvJbALs4jGuKqa1Jz4dkt4JrQ1gA0T26TA4cP8tE5r4
+            WU53JPHRvCoyTYrhESCmBBdZioCMRwjDI5GIl2fHSWOAlksyrA+Wuvc4xNzswWs/
+            Dvdk7pZ9dmHA0XTsa2WDnhwUMa+JQ4cVNDH+6dHH5jCpDooPzcx8O33eGLx2SRHp
+            rjk2HmXSY+pVquk0NM17kPZ1U/4WKu5C93blgVefcXNVr5TiEcyTxzj/6tsCAwEA
+            AaN7MHkwWAYDVR0RBFEwT4IcdjIuZGFzaGJvYXJkLnN0bzEuc2FmZWRjLm5ldIYv
+            aHR0cHM6Ly92Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0L3NoaWJib2xldGgw
+            HQYDVR0OBBYEFNWIIHLp3uFzCFn5TYyxSJUZy5a+MA0GCSqGSIb3DQEBCwUAA4IB
+            gQCWNOyJP0TMENbdKCmmkjw0nyMtI4g3V5TszWFWBC9H0NnFBeo3gbt/93Zg5ORS
+            K9p4/7bwQqILoghbW+6P4x3TBMWn0xwlwl/c2IWczYl1zaLIEvkQGpo5TAiPxdok
+            xQn5LfPlAXxbzPpIJbveRfPklf368JOtmcE5JJmefNN/GMocsQKqcSXbnKIZOTrm
+            rWMJeylzNXKsWMyrQyaiASAFbAcI1yJpKEawt+lIa/NW2k+kzGmizxnOZPa/AR76
+            EZuUzev9SGa+t/b4+i3uy8v3d+8vfj5otvKRPpWWYPRLRqbg8jQsVgkj44Hsh4SL
+            1mkkln+ZHsXFkndAKIQzwc0CfAl3+jqiPG/LBMOeCYkEnZ6qdB2sxHHenk6RTp1c
+            pZL1oR/lrI6CAr2qHU85e66Lv5cA7j0y/ruUvMdHlwnb+PFQlhH1PlMRoRdFaPdH
+            Y6XP9FXfR8gENgSkWQlSIR3Rqu7/cMnpavMIg2lEmjD6jT4YDL2GJkzMwyilH8UH
+            6IQ=
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
-    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
-    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
-  </SPSSODescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+            MIIETjCCAragAwIBAgIJAJcLyHdonAWdMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
+            BAMTHHYyLmRhc2hib2FyZC5zdG8xLnNhZmVkYy5uZXQwIBcNMjAxMTMwMTYyODE5
+            WhgPMjA1MDExMjMxNjI4MTlaMCcxJTAjBgNVBAMTHHYyLmRhc2hib2FyZC5zdG8x
+            LnNhZmVkYy5uZXQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCs2Sll
+            UpybtYoyfa8jGQSXwIbz27wEUQ+eD7S64rQrd65WsBgaLA6KisFRqvAGc+XZ4Kp1
+            Gy5/Z23RE3h0PeoWLHl3BSwXfVLqr2d6xPfH0ypde1LurU+4nidGxSwDTdmWJShG
+            0aMT8xRXpQ1l0DlXRwfOsqMlbE2IEkuJpaRbqpmicg9rxIxndPBOAgK0MxettlLR
+            hOfBAn51Tbk+ltJKHbEyOPRv/4iu3kDtnG/2GELGieSJdKsTBpM5RPDHgZfrfB61
+            X67g7XP51qM9SrNpGTO2pgaf2yLIeA30f6doQJRPPYZRBUYjEqmCkKPe0Xa4bFjO
+            g4mOq8mrbJaofQB621cPo+jJRYHYpoHqbbPs4x6uWnWcHH5IUCMgsFD26qM5BR+i
+            YZJkTsTt1pK89gMXnCQZMTk4sqKxwqQurIhAvZeL1puxcR5FM0crCriIv8R2l0LI
+            LZA3xcyrCWcrhtQsIrbKm3i1xBbqT8SgjRY8e3mgnKOgeHQrdTivYv0clEkCAwEA
+            AaN7MHkwWAYDVR0RBFEwT4IcdjIuZGFzaGJvYXJkLnN0bzEuc2FmZWRjLm5ldIYv
+            aHR0cHM6Ly92Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0L3NoaWJib2xldGgw
+            HQYDVR0OBBYEFDziH9/zY4tiJEr6XoFfdGV6819wMA0GCSqGSIb3DQEBCwUAA4IB
+            gQAMzU05TMuosKoO3oVn1QSymfdL/Rj7sDuzbo024gBdjKL0H2RUGneS2iU4umdX
+            kOGquRm4ZfVjuz2WTy/OnuJDoPIV/ehbAT0PivAe/2DCbKtiZ7UkIm4mRsEOe6Qg
+            MVpueXEPs4mf5NTHaagh6fgC9afEHIaVSqup+wMZF/lSgz0CAuO3qCXC8KZRnAsj
+            ZK+OWe5+XUkYyftCzLq0aOyjTkvU6vJeCpru/IB7aNudnfFrAEdyD5c2o8lbWmP4
+            My8DMv7Qeg7KqZ/DeXm5Dk3sOLtvB6ki90jNNUrw24iFMfZ6P17RxLjLefxJ6eTS
+            XrvbpH27EA4wHk5VKn9PSWXyxaxv+cEUSEBTCFeWq10/kZ+n/eknlXeZUknaK7kx
+            w9OzqKa9I5LyupRo/4WhPJvEaKSniSfUxHHSC9wT6nz2SUoqGPOHPtyk5JVL9sxO
+            F/QhYLMLru1u9EaRCpzt8XLKhNqE9nm+T7jywkxHuoMcNUvSOD8TqdrEv+dMMIKA
+            TH8=
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.dashboard.sto1.safedc.net:5000/Shibboleth.sso/Logout"/>
+    <md:AssertionConsumerService Location="https://v2.dashboard.sto1.safedc.net:5000/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Safespring OpenStack</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Safespring OpenStack</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>