From 88212464ea135dd554c3c9766d3bb593d71077ba Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 23 Feb 2021 12:03:43 +0100
Subject: SWAMID-97, Publicering av metadata för alla instanser av Primula i
 SWAMID produktion + GÉANT Data Protection Code of Conduct
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml | 83 +++++++++++++++----------
 1 file changed, 51 insertions(+), 32 deletions(-)

(limited to 'swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml')

diff --git a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
index 16fbbc88..7920e242 100644
--- a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
@@ -6,25 +6,26 @@
     </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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Uppsala universitets Primula</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Uppsala University Primula</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala universitets personalsystem Primula</mdui:Description>
         <mdui:Description xml:lang="en">Uppsala University HR system Primula</mdui:Description>
-        <mdui:Logo height="50" width="50">https://primulaweb.uadm.uu.se/Primula_logo_med_text_90.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://primulaweb.uadm.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://primulaweb.uadm.uu.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://primulaweb.uadm.uu.se/Primula_logo_med_text_90.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://primulaweb.uadm.uu.se/Primula_logo_med_text_90.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=879774&amp;l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=879774&amp;l=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=589118400&amp;l=sv</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=589118400&amp;l=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -47,26 +48,44 @@ sSTegEDIGBp64fKxe6vEUaUKq8V9q/QGutnM87N8ZX39uYeNoUsxyA==
         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets Primula</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University Primula</md:ServiceName>
+      <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">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <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:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Löneenheten</md:GivenName>
+    <md:EmailAddress>mailto:lon@uadm.uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4716677</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Primula datordrift</md:GivenName>
+    <md:EmailAddress>mailto:primula-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Löneenheten</md:GivenName>
+    <md:EmailAddress>mailto:lon@uadm.uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4716677</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3