SWAMID-1000, 1003, 1004, 1005, 1034, 1036 update from uu.se

6 files changed, 68 insertions, 11 deletions

diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/swamid-2.0/indico.test.uu.se-shibboleth.xml
index e1e8eee2..48337c7a 100644
--- a/swamid-2.0/indico.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.test.uu.se-shibboleth.xml
@@ -27,9 +27,9 @@
         <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:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml: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="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -46,6 +46,7 @@
         <mdui:InformationURL xml:lang="en">https://indico.test.uu.se/about</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://indico.test.uu.se/static/custom/privacy-policy-en</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://indico.test.uu.se/static/custom/privacy-policy-sv</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://indico.test.uu.se/about</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -99,6 +100,7 @@ acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indico.test.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Indico TEST</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Indico TEST</md:ServiceName>
       <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" 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:AttributeConsumingService>
@@ -113,6 +115,7 @@ acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
@@ -120,4 +123,16 @@ acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
     <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Ruber</md:SurName>
+    <md:EmailAddress>mailto:roger.ruber@physics.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Ruber</md:SurName>
+    <md:EmailAddress>mailto:roger.ruber@physics.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
index e003d6a5..344108e5 100644
--- a/swamid-2.0/indico.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth.xml
@@ -27,9 +27,9 @@
         <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:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml: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="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
@@ -46,6 +46,7 @@
         <mdui:InformationURL xml:lang="en">https://indico.uu.se/about</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://indico.uu.se/static/custom/privacy-policy-en</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://indico.uu.se/static/custom/privacy-policy-sv</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://indico.uu.se/about</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -103,6 +104,7 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indico.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Indico</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Indico</md:ServiceName>
       <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" 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:AttributeConsumingService>
@@ -115,10 +117,9 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
@@ -126,4 +127,16 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Ruber</md:SurName>
+    <md:EmailAddress>mailto:roger.ruber@physics.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Ruber</md:SurName>
+    <md:EmailAddress>mailto:roger.ruber@physics.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml b/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
index a51e8237..3fc4f50b 100644
--- a/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
+++ b/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
@@ -23,6 +23,8 @@
         <mdui:InformationURL xml:lang="en">https://openexam.bmc.uu.se/about-en</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://openexam.bmc.uu.se/privacy-policy-sv</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://openexam.bmc.uu.se/privacy-policy-en</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -56,10 +58,22 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>OpenExam Support</md:GivenName>
     <md:EmailAddress>mailto:openexam@bmc.uu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>OpenExam Support</md:GivenName>
+    <md:EmailAddress>mailto:openexam@bmc.uu.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>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
index 89baa8b6..135e7351 100644
--- a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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="sv">Uppsala universitets Primula TEST</mdui:DisplayName>
@@ -89,4 +89,9 @@ Mu4KdgUL90mgwqgRfRekVFzBfQ==
     <md:EmailAddress>mailto:lon@uadm.uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4716677</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
index 6e6ebb9e..4a9e8f34 100644
--- a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
@@ -10,7 +10,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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="sv">Uppsala universitets Primula UTV</mdui:DisplayName>
@@ -94,4 +94,9 @@ O5RRhRrqQ+FqWofyuV1dizmnxKVpfkF+9A1ro8WlITlzhxU=
     <md:EmailAddress>mailto:lon@uadm.uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4716677</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
index 38c3a879..f265362e 100644
--- a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
@@ -88,4 +88,9 @@ sSTegEDIGBp64fKxe6vEUaUKq8V9q/QGutnM87N8ZX39uYeNoUsxyA==
     <md:EmailAddress>mailto:lon@uadm.uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4716677</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>