SWAMID-1058 SWAMID-1059 SWAMID-1061

3 files changed, 62 insertions, 9 deletions

diff --git a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 16bf0995..81c96ec3 100644
--- a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -5,9 +5,8 @@
       <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:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -18,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">KAU.SE web development server</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Dev server för www.kau.se</mdui:Description>
         <mdui:Description xml:lang="en">Dev server for www.kau.se</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/about-web-site</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/om-webbsidan</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -40,6 +43,14 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://durin.sau.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://durin.sau.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Kommunikationsavdelningen</md:GivenName>
     <md:EmailAddress>mailto:webmaster@kau.se</md:EmailAddress>
@@ -52,4 +63,8 @@
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.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>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 36400d91..4246dd45 100644
--- a/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -5,9 +5,8 @@
       <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:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -18,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">Kau.se webbserver for training</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Logga in för att lära dig redigera innehållet på www.kau.se</mdui:Description>
         <mdui:Description xml:lang="en">Login to to learn how to create and edit content for www.kau.se</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/about-web-site</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/om-webbsidan</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -40,8 +43,28 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edit-utb.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edit-utb.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Kommunikationsavdelninen</md:SurName>
+    <md:EmailAddress>mailto:webmaster@kau.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>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 436055a3..1ae1de07 100644
--- a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -5,9 +5,8 @@
       <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:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -18,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">KAU.SE web staging server</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Staging server för www.kau.se</mdui:Description>
         <mdui:Description xml:lang="en">Staging server for www.kau.se</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/about-web-site</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/om-webbsidan</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -40,6 +43,14 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moria.sai.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moria.sai.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Kommunikationsavdelningen</md:GivenName>
     <md:EmailAddress>mailto:webmaster@kau.se</md:EmailAddress>
@@ -52,4 +63,8 @@
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.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>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>