SWAMID-1049 update aktivera.su.se

2 files changed, 90 insertions, 36 deletions

diff --git a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
index 91ff156d..21493660 100644
--- a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
@@ -1,55 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://aktivera.su.se/Shibboleth.sso">
   <md:Extensions>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-12-05T13:37:25Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <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:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <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://aktivera.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://aktivera.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/WAYF/antagning.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/WAYF/eduid.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/WAYF"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aktivera.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/WAYF/wavelan"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aktivera.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/SWAMID"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aktivera.su.se/Shibboleth.sso/SWAMID" index="3"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.su.se/Shibboleth.sso/WAYF/otc-idp.it.su.se"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Aktivera.su.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Aktivera.su.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kontoaktivering vid Stockholms universitet</mdui:Description>
         <mdui:Description xml:lang="en">Activate account at Stockholm University</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/behandling-av-personuppgifter-vid-aktivera-1.582741</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">Kontoaktivering vid Stockholms universitet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Aktivera.su.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Aktivera.su.se</mdui:DisplayName>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/behandling-av-personuppgifter-vid-aktivera-1.582741</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/behandling-av-personuppgifter-vid-aktivera-1.582741</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.su.se/english/education/a-smooth-start/get-access-to-it-services-your-university-account-and-order-a-university-card</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.su.se/utbildning/en-lyckad-start/aktivera-ditt-universitetskonto</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>signuptool-prod-app1</ds:KeyName>
+        <ds:KeyName>signuptool-prod-app01.it.su.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=signuptool-prod-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAN4wS9MFVZVYMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNpZ251cHRvb2wtcHJvZC1hcHAxMB4XDTExMDIyMjA5MTAzMVoXDTIxMDIx
-OTA5MTAzMVowHzEdMBsGA1UEAxMUc2lnbnVwdG9vbC1wcm9kLWFwcDEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsMwbsy/oF6Gt6pioQahFEJEYQb92t
-w7bWz3hgJO5uDM2gW/H2b69nQGjnKiixafh+ggrn8ckHCrFU2DmCK/qDsJ8ogKIY
-8S2pExyZxnIccKy/CIB2elYEW4h2Eg+JeRbWW//0DJyDAdeDOEMk7MNE+1qebj5V
-QKuoHnUmhMOy0vSYheIxsJ4gqQRZ09QI0YcWeVwSuQ/z8m3s5uOyyvmNLVmUT4bC
-flEJiUGtLa+ORmUeK1Vlk4nuJ/excQK6J6DFeyZDSkSBzizmmXIkRZQsFQGCOSBV
-RhauOY1h5Yrr7TMMmYz5WsSBUb7yI413A/QhsMH0G5JDlsBYjWM5JsypAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNpZ251cHRvb2wtcHJvZC1hcHAxMB0GA1UdDgQWBBQe
-1Qig5SZgrvaBOENdpaZQMbN1jDANBgkqhkiG9w0BAQUFAAOCAQEAnkeyJMh3FVYq
-c4yCDWdg60dv5+fXxvRBdfDS3Zaw6jfoWVRKDgPMfIxcMg7mm11cw8os2T+kqEOu
-yYLeriwG21WsXyihMydql7eRYxBLyVWwRQXQVNczMkCsZiE8kcC6i1t2FISxqLon
-uL4fct/0jh2G3zGO+11qOeJkjldKO/iJetq6sMArvNPILW1Qr4UwgjJ6IJsPdDSY
-IBK/w82B1jJWgKJQKyOYrdWxbb3gNAh7zsbHC5sjOMD+tMvjVDuyyoL8vM01yQQ2
-sksVCOjhrCaJpWxMWRyrMNUONHEZhJYI++lAGGQDraWowS+trAnniR+pnrqujoZm
-mqvHC5Aeiw==
+          <ds:X509SubjectName>CN=signuptool-prod-app01.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAOfU86X0wuv7MA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHnNpZ251cHRvb2wtcHJvZC1hcHAwMS5pdC5zdS5zZTAeFw0yMjA2MTMwODIx
+MjVaFw0zMjA2MTAwODIxMjVaMCkxJzAlBgNVBAMTHnNpZ251cHRvb2wtcHJvZC1h
+cHAwMS5pdC5zdS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAN5F
+o8WIrXEbptYvAJhZv5znBRuaOHPIeJa9Mhy//TxEuv+KcYLpDVVEhGFDVM7UWzTo
+t0d8E+e7lGNZefVqqWtpC23ZaE0CTO4yn6r2VAjuVt9OqzyrAGo17bxERa7iur8y
+BRzpeKwZ6IVQwYckZ3Mk4OSFYKVu5Pq+ILsSxDGTIbjYId9KdZmjbvrWoRpNw8KV
+4dGRgx1o+N9gUl66ajk1FZlvK7PPCwuPKGvt60g22GpbyWYIH7fHUdz7bu9hTFf6
+sZWL4F3Pon1lMR+v+MGlxJQI/Uj+hRj7IDw9xWf5HNlq2SttTLeLq9oIgWOxSULU
+1wt+PeOMk2UUmg5Kb6aUnvDhbmnZBaLlbw8eWWDZrS81SYoM+4+F0IYccZnuH9Am
+/dG2C4tASDq/T8fav4xuaxJXTeX17YoyZ5wvzlRbLPvKgUhyafva8uXs9omsxH86
++ia4dsmqx1+pCSUWn77KTpL7MIRmeCSK+nAtSdqhw2gb5qKYU5QMxbRq0U133wID
+AQABo0wwSjApBgNVHREEIjAggh5zaWdudXB0b29sLXByb2QtYXBwMDEuaXQuc3Uu
+c2UwHQYDVR0OBBYEFBLXc+RImH/k24e+E44o8BeYgsV+MA0GCSqGSIb3DQEBCwUA
+A4IBgQDZtsjRgc3yqBxgB3Z7qZFi88SlO02Xpz2SthcNk5slAn7JVLRi18uXNN6E
+C7woWLLaLcYPLR/kBOxFaKZ90Fhzuqc8yW6h+SppM5bxq/5QgZxchOHq5gn71WHq
+n6m79KwjkOG/YsuYw7KgMnjQ8C8o2ApPQ/iaq0YOw5Ud0jO+fq9T7EJNyCkpcSf3
+ElWqEOEd0gNI5uifcfqsRKhW5IBe16OtMNi4HkAxoKntZ6TSUlAqsMLntZ4sksyU
+szXMkLTyUDj3KnAw+yO2QZQmuMrFj7egD5WbAC5aPsmeLPiFxe/k/3eVkFeXAvTT
+VLviLePKz3EBRJjS9ZInupyGFu/3Z+fDT1c3WAyF5wuKT2Dl5uygt5Ca1sy5HDSc
+2E2O/4pTqjRpjvSf9z3z7VlQ883ogv4d6vo3qpst62bifkK0XbUE1BBVoBDnDhg4
+3lCweGl8W0PMkT11tRB+dbBp8EMLrhtomEnXmitxSLoiwvC+q3LNyHUH43wMtOH3
+QZgdWSo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:KeyName>signuptool-prod-app1</ds:KeyName>
         <ds:X509Data>
@@ -87,23 +132,23 @@ mqvHC5Aeiw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivera.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivera.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Aktivera</md:ServiceName>
       <md:ServiceName xml:lang="en">Aktivera</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Aktivera</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <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" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.su.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>IT-avdelningen</md:SurName>
@@ -113,4 +158,13 @@ mqvHC5Aeiw==
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName> IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.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>IT</md:GivenName>
+    <md:SurName>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 71bc7d7d..a498fb71 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -47,7 +47,6 @@
   <xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/aktivera.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/account.mdh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dedserv79.levonline.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.augustus.se.xml"/>
@@ -691,4 +690,5 @@
   <xi:include href="swamid-2.0/www7.kau.se-.xml"/>
   <xi:include href="swamid-2.0/mdu-graylog.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/mdu-ni.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/aktivera.su.se-Shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>