SWAMID-2549: Updated idp.dev.eduid.se-idp

1 files changed, 61 insertions, 27 deletions

diff --git a/swamid-testing/idp.dev.eduid.se-idp.xml.xml b/swamid-testing/idp.dev.eduid.se-idp.xml.xml
index 98abd4c9..98cf700c 100644
--- a/swamid-testing/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-testing/idp.dev.eduid.se-idp.xml.xml
@@ -16,37 +16,58 @@
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://dev.eduid.se/errors?code=ERRORURL_CODE&amp;ts=ERRORURL_TS&amp;rp=ERRORURL_RP&amp;tid=ERRORURL_TID&amp;ctx=ERRORURL_CTX">
     <md:Extensions>
-      <shibmd:Scope regexp="false">eduid.se</shibmd:Scope>
       <shibmd:Scope regexp="false">dev.eduid.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">eduID staging</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">eduID staging</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eduID pre prod environment</mdui:Description>
+        <mdui:Description xml:lang="sv">eduID förproduktionsmiljö</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.eduid.se/faq.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.eduid.se/en/faq.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://eduid.se/en/faq.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAjigAwIBAgIEUrLhgjANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJT
-RTEiMCAGA1UEAxMZZGV2LTIwMTMxMjE5LmlkcC5lZHVpZC5zZTAeFw0xMzEyMTkx
-MjA3MzJaFw0xNjEyMTgxMjA3NDRaMDExCzAJBgNVBAYTAlNFMSIwIAYDVQQDExlk
-ZXYtMjAxMzEyMTkuaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEFAAOCAT8A
-MIIBOgKCATEA1f/fv5GSVkRNkPj1xVshkDlVaVTSeofLjJeFK820uVMaZagUsn8T
-mML2YdH8CyLEAZgeU8V/oF2P1SFieG1Ex3lBflLGWw/7pQqe08tjfTkeJthntJJR
-W2gCa4I0v1bsJS02U7pVizDv4/3zIo1EpAHrmu7NOs9ybCHA0RnrdQk6aHppe6nz
-571Cz3F6zlp9sc4X3Dbf1sVtXHSArUjOh3bgjQnvOAAirJqSYzZgav54WwLzcsas
-JMEwLnRSiyRxXm0dnuqhsM7xlJM/G7X35zhBQFwxUKJ33b1xu9PPFfoqIH/NjoPU
-gj15jTxvXQam0DvkHMFQvn87bfrtdW187ENZ2lPBYw/yFfF2Mffh0xYKlemJ7LEs
-Y1FMJStI+7vKEq9DHGedUfufhFEZNtJW0wIDAQABo0AwPjAMBgNVHRMBAf8EAjAA
-MA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFPM+gGbOGyvozZ3L44342h8VTKCN
-MA0GCSqGSIb3DQEBCwUAA4IBMQBlBpfl/507hO/upCjKsmtKL7SMufq/kGXb1VB8
-gFiBHgH96woVz/AwHRAVfdrKsQxriXFnOAlgnSAgUtfOmrO8t2mDJ3nxVLW/eKfz
-ZfrQCTLxcZpQnzmYlNCyFepjbpb0E9I2wkUeY4DvdzzMlQFwxjSDWa2NPc5UiXAe
-EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
-g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
-xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
-hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFQzCCAyugAwIBAgIUHEkGDhkQxFeXZqyQNGgzGKi3CDMwDQYJKoZIhvcNAQEL
+BQAwMTELMAkGA1UEBhMCU0UxIjAgBgNVBAMMGWRldi0yMDIzMDExNi5pZHAuZWR1
+aWQuc2UwHhcNMjMwMTE2MTAxODUxWhcNMzMwMTEzMTAxODUxWjAxMQswCQYDVQQG
+EwJTRTEiMCAGA1UEAwwZZGV2LTIwMjMwMTE2LmlkcC5lZHVpZC5zZTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAOma+QaKWGanJIsKwai1jtxBwap0JP1h
+pjq69bodvhTvmyWJRNHXiJqTXktHa2aw9vjHbF6hpzvNVOVsnl0M7Bv/oOR9dMJc
+Ec67LzmySbotj3DWIytQw+OinxzhDGghjP6G9Wvb1c7mYCpI3adXIJvOfoDO+Nqd
+xPNCmt/dzZrojjMZ5wXmENYtj1IEy41Ovgqcvh6aumNVP/chmerlIsrWX0mSuKfH
+JInZyQwm4b/wkK2uzynR1vyIk0Pmx02LI4Djy0lUNSenho8UT8iDNAuLnm8oLy1b
+GMUVacsMiANNCb4+/NSCRME3kkxdALaEywJeFqcH7EhXUXqEx1dME/im7201cgXe
+0Jrt8/ZfR2xkEt/Z1awXDmL4hFIOsKmhO4UOP59ZU/nWrlVvgc6QCdCzQ7YcR8FO
+rVAhdsuWz7j6MDMoogUJDqv4RPC3yNraKtmHoeKK6OeIMKew6u/5xnTiy0Xsl6zq
+32cB0m7YT1tyWa/02sXFW+O3U9/BhuUFe+zZlmIfVSRzFnX9wC/0HqQfCdecZ5gm
+tVf8xJi9WRapC+yBnb9bDHcSQ4w9Ug4D+pWaCZDAPjCCTukpto72LIC3a2+Yg95c
+BrZoJ34socPq9Sb13/b/fVu4zpuA57RFfpKVfAu3MMUXhqFXs1Td1tsTUsasGvE8
+K1LFZy1gwFmJAgMBAAGjUzBRMB0GA1UdDgQWBBScxCzxrKVeXyGGA5cpWlai6oZK
+NjAfBgNVHSMEGDAWgBScxCzxrKVeXyGGA5cpWlai6oZKNjAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQBZAiliB629qNnVcSHLWLZsP4Bhb+3QWP3+
+RNhuQORXvWHEMUmJorJKl7cYq0LNN+uFgE5gWynXfsFGtBIfMjKxqz7taSC3J1i3
+9JNHxeh2GYDRUF0ude9TKu00f0hbKqO/tuJnZ8hyczWnZ4BaJwzBLmhBeQGLPHan
+phwmMJiGJ6yc+JEicSqJgDN7nzw6e4IDVjgemOLbSYhMJTWDUZnb1wCtCwXE0gN0
++exMGCfZQTEqET6sPuUgVeUOC7ZjfB28RQKfSuLcU+6faCD5pxTpyg6QB3Fuxr6X
+27emSD8ABobNSl+YiPoTBkRdcy+S+pyVVetazJs7Y3z29TA2PHFi4ScFfv3HNtr+
+mN+0Rj+ALE2jfVmDSmSyVHTxxySZpoITIYxhiW/MwcuURrkTvocy276HMBfkHvUP
+hhOTfIMkK7LswzpM75IS7Birm2fFojt7wFD/KqFIL/kA7ai9G41JNN/VrUZV4AH4
+ooDNYu5cj9RQOZQU9oh2/5BFCDYkLAW/o//RJQigiVfoWOMIzYxiMfIp7d4UyQn9
+laN+SToSMqOgXCW5vyhYxziUX4Ny2ViLqFdmwEn6dlcvhIjZMH8aR9AXWZOyYUCi
+cUe5K14PAHVtedweCUpEZkPOl8bZ+II/LUOJOnxge1sdBvLrN3uXMP3caU0fHbNg
+BShUYiR7Ug==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -71,8 +92,7 @@ ZfrQCTLxcZpQnzmYlNCyFepjbpb0E9I2wkUeY4DvdzzMlQFwxjSDWa2NPc5UiXAe
 EswKK3kEA0luYKv2EN6oiylL5fYP5yx5Hdb22hrUW/Wel2pEGxLK2+Z7vzz87irI
 g/7m8/uxxFfPciT39R2t/lZu21ZxnL0zafvT8/NT7ZvSdn/uvZyhETtg4TqL02QZ
 xkPaPHxjjBMdLtLPmmHXVgaYczQFoO8GrxfsR+gkCEu4mbVn5rhFxl/r/OrwxacI
-hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
-</ds:X509Certificate>
+hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -86,17 +106,31 @@ hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">eduID DEV TEST</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduID DEV TEST</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.eduid.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>eduID</md:GivenName>
     <md:SurName>developers</md:SurName>
-    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+    <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Support</md:GivenName>
+    <md:SurName>personnel</md:SurName>
+    <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Admin</md:GivenName>
+    <md:SurName>personnel</md:SurName>
+    <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Security</md:GivenName>
+    <md:SurName>personnel</md:SurName>
     <md:EmailAddress>mailto:feedback+swamidtesting@eduid.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>