Merge branch 'master' of git.swamid.se:swamid-metadata

3 files changed, 60 insertions, 34 deletions

diff --git a/swamid-2.0/kau.hr.evry.se-shibboleth.xml b/swamid-2.0/kau.hr.evry.se-shibboleth.xml
index 6e0da206..0f73a2f7 100644
--- a/swamid-2.0/kau.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/kau.hr.evry.se-shibboleth.xml
@@ -23,6 +23,10 @@
         <mdui:DisplayName xml:lang="en">Primula</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid Karlstads universitet</mdui:Description>
         <mdui:Description xml:lang="en">The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at Karlstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kau.se/ny-medarbetare/efter-de-forsta-veckorna/om-din-anstallning</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.kau.se/ny-medarbetare/efter-de-forsta-veckorna/om-din-anstallning</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.kau.se/information.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.kau.se/information.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,8 +51,7 @@ GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
 NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
 2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
 fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
-</ds:X509Certificate>
+DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
@@ -65,18 +68,32 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://kau.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Primula Web</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eppn" 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="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"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ki.hr.evry.se-shibboleth.xml b/swamid-2.0/ki.hr.evry.se-shibboleth.xml
index 9d5ec08e..214c9f18 100644
--- a/swamid-2.0/ki.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/ki.hr.evry.se-shibboleth.xml
@@ -23,6 +23,10 @@
         <mdui:DisplayName xml:lang="en">Primula</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid KI</mdui:Description>
         <mdui:Description xml:lang="en">The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at KI</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://medarbetare.ki.se/primula-vis</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://medarbetare.ki.se/primula-vis</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ki.se/ki/om-webbplatsen</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ki.se/en/ki/about-this-website</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,8 +51,7 @@ GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
 NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
 2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
 fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
-DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
-</ds:X509Certificate>
+DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
@@ -65,17 +68,31 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://ki.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Primula Web</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eppn" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tietoevry Industry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tietoevry Industry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tietoevry.com/en/about-us/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.tietoevry.com/se/om-oss/om-tietoevry/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:primulasupport@tietoevry.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml b/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
index 3d098e1d..0b5b4e62 100644
--- a/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
+++ b/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
@@ -17,6 +17,10 @@
         <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/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -46,8 +50,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
                         BQAwGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMB4XDTIwMDIyODE0MTkzMloX
                         DTQwMDIyODE0MTkzMlowGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMIIBojAN
                         BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAjSLQZe0gVwlmXmX7Aodd7RtVIq7x
@@ -69,16 +72,14 @@
                         4+MRo+Mla4dxpRFZCjjPzJfIoWZ4zyRCknVyITj10tVFDyZhgoGlwj3OXrny8HEz
                         syr6g6Dv3/Dvpa2hfvagYaV7MCS63lxnEwhrfHR9s8BwYhmLzKybVc+V+39cddMb
                         rQxCop8QUrH5asbJFtrD181RVvg+78kE6+06+ZpRK3fMWOxaXYQNgTsV9SUknt9W
-                        vfDfE7lmEmBH3KU=
-                    </ds:X509Certificate>
+                        vfDfE7lmEmBH3KU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
                         CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
                         Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
                         DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKV4FKUullzDjlhIueafuIMUklq4
@@ -100,16 +101,14 @@
                         xZlszLFdompzKrg4GV0hOYCVzbYHP87okyKexYqM+ILsjnbiBaYPhvbT0OvqzCyB
                         3xR3z6v9VJ7iZb6s53/6hfPIOaqoigCVVs9kryL/LWxAcONVe3j+LHSpO/LbVeVl
                         PhPdkKEJlNSh0fl1He/4tDRgn6oxtriCeGhkgkgec1Wts9ToVkVTx8Qj7KOH5pY7
-                        /3I+s2NlmSzSfJF2
-                    </ds:X509Certificate>
+                        /3I+s2NlmSzSfJF2</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
                         CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
                         Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
                         DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIxmBcbFnCYXL5QozP0c1RSoAs9R
@@ -131,8 +130,7 @@
                         K8iUARfquSCvJbq9u68bpfG85c3CPwX4Wjke71CV50P1fwWosXUZDawR+am6PEP6
                         OJ8Dg60C40ih35vpVLw3Ro7L/48vDtE79Ncc6jPEoincmJNHsdzhWwhB0kdPC2hy
                         BOk5y8w16iqOOkOJmt1bBG5Y3fxXxFKsqecJnGu+bz++xLjtCOJhV2WEsevWKelB
-                        S1UOXyr6n+XEbwgu
-                    </ds:X509Certificate>
+                        S1UOXyr6n+XEbwgu</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -151,8 +149,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
                         BQAwGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMB4XDTIwMDIyODE0MTkzMloX
                         DTQwMDIyODE0MTkzMlowGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMIIBojAN
                         BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAjSLQZe0gVwlmXmX7Aodd7RtVIq7x
@@ -174,16 +171,14 @@
                         4+MRo+Mla4dxpRFZCjjPzJfIoWZ4zyRCknVyITj10tVFDyZhgoGlwj3OXrny8HEz
                         syr6g6Dv3/Dvpa2hfvagYaV7MCS63lxnEwhrfHR9s8BwYhmLzKybVc+V+39cddMb
                         rQxCop8QUrH5asbJFtrD181RVvg+78kE6+06+ZpRK3fMWOxaXYQNgTsV9SUknt9W
-                        vfDfE7lmEmBH3KU=
-                    </ds:X509Certificate>
+                        vfDfE7lmEmBH3KU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
                         CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
                         Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
                         DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKV4FKUullzDjlhIueafuIMUklq4
@@ -205,16 +200,14 @@
                         xZlszLFdompzKrg4GV0hOYCVzbYHP87okyKexYqM+ILsjnbiBaYPhvbT0OvqzCyB
                         3xR3z6v9VJ7iZb6s53/6hfPIOaqoigCVVs9kryL/LWxAcONVe3j+LHSpO/LbVeVl
                         PhPdkKEJlNSh0fl1He/4tDRgn6oxtriCeGhkgkgec1Wts9ToVkVTx8Qj7KOH5pY7
-                        /3I+s2NlmSzSfJF2
-                    </ds:X509Certificate>
+                        /3I+s2NlmSzSfJF2</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
                         CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
                         Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
                         DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIxmBcbFnCYXL5QozP0c1RSoAs9R
@@ -236,8 +229,7 @@
                         K8iUARfquSCvJbq9u68bpfG85c3CPwX4Wjke71CV50P1fwWosXUZDawR+am6PEP6
                         OJ8Dg60C40ih35vpVLw3Ro7L/48vDtE79Ncc6jPEoincmJNHsdzhWwhB0kdPC2hy
                         BOk5y8w16iqOOkOJmt1bBG5Y3fxXxFKsqecJnGu+bz++xLjtCOJhV2WEsevWKelB
-                        S1UOXyr6n+XEbwgu
-                    </ds:X509Certificate>
+                        S1UOXyr6n+XEbwgu</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>