SWAMID-97, Publicering av metadata för alla instanser av Primula i SWAMID produktion + GÉANT Data Protection Code of Conduct

4 files changed, 242 insertions, 32 deletions

diff --git a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
new file mode 100644
index 00000000..b97af4c2
--- /dev/null
+++ b/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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://primulaweb-ft.uadm.uu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </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:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets Primula TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University Primula TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets personalsystem Primula TEST</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University HR system Primula TEST</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://primulaweb-ft.uadm.uu.se/Primula_logo_med_text_90.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://primulaweb-ft.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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDzCCAfegAwIBAgIJAPZpvDic/HHVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHByaW11bGF3ZWItZnQudWFkbS51dS5zZTAeFw0xNjAxMTMxMzA3MTdaFw0y
+NjAxMTAxMzA3MTdaMCMxITAfBgNVBAMTGHByaW11bGF3ZWItZnQudWFkbS51dS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3AJdiyKqMljln3dJOr
+iGdBC5UcJirF3wFmQGek8iieEgoSf6w8D5/fe2ZwXObr3QRfSN0jSYJJDj9mY/KB
+6ePL9fKlCh8S+2ASttpp7myUjj8pr1oWdk/oVLMHT6DY8aOUDXbcpcPJ7cC8JSTk
+7mmOlbHDPVBu1ombmcgjj/OcnspbiPcWDI0onZmNrzxE7g1Vv/BI5STJWS2nmujk
+nwXkcsRFRq2e0Aku0/WpPpkGr6kI8AxztmFhQIm4zahMqbFfGLiiveoOkDF3hnul
+pYUTo8C9/H0CwjGXrXcoEtk1hySkiMGBVdhF+iT73UBcuE4G5SThzf1YR8HJVGIJ
+ay0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHJpbXVsYXdlYi1mdC51YWRtLnV1LnNl
+MB0GA1UdDgQWBBTxrRpSa7lA4Fr2WQnMhNGekg5qZjANBgkqhkiG9w0BAQUFAAOC
+AQEARJ5xGYzExdMHu2mOVeMuTH7TT1eJCqUUr2ALdep/3H+79z0Cs+uXnsva83uu
+twYKFqVNI+SF3Rdlrw3C79KCJBY9zgRVbUIXEKtD2hjwzPMPawxuJC9xUKYiLH2Z
+LQQL3w9NE0NN00AImhRenJsL+toQCSybllR1ykNSAFb3pJIf1GRpkRg3Pw2jSvyh
+VbDTJ8rITxjb30BV7SdcIRfaTgDOmXpJRDxB3irFk5DfYV28bFD4VSmRgQxeBccP
+Q9pE7Bfu+MM8CcPiWPcNqE8szbu5XeoaNENU+qp8C/8WGkCMCPIATPflw/NAEr5J
+Mu4KdgUL90mgwqgRfRekVFzBfQ==
+        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primulaweb-ft.uadm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets Primula TEST</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University Primula TEST</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>
diff --git a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
new file mode 100644
index 00000000..88a1e200
--- /dev/null
+++ b/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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://primulaweb-fu.uadm.uu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </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:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets Primula UTV</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University Primula DEV</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets personalsystem Primula UTV</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University HR system Primula DEV</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://primulaweb-fu.uadm.uu.se/Primula_logo_med_text_90.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://primulaweb-fu.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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEDzCCAnegAwIBAgIJALwQAqnygsGAMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHByaW11bGF3ZWItZnUudWFkbS51dS5zZTAeFw0xNzAzMjQxNDQwMTJaFw0y
+NzAzMjIxNDQwMTJaMCMxITAfBgNVBAMTGHByaW11bGF3ZWItZnUudWFkbS51dS5z
+ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMvanZD7BK0uJ/0PM+9C
+iNO2hiF62SrQS+Mjm253f1MjkwVs+9GDsp4Y8c2yQTVetIqnPgVxjP2JETyjAZn2
+2M/Z+Zhx5UghxjWx8JFsx1c4ukF/y2szXUjF4fcYn/Ht6cntAX2tdC8pNY8UfXYD
+/0tiU5gCmlN6gf1HgGD7bsMQSW898Aniny6bkwim6zZQGRYhr6f+IwIxS9NM8H8g
+JhgfoqWiQzIp1wIS67tBVEY3EElnOqqis4Z7rcBj8qiHQTpyEsfVNMHgg78BmYzt
+xZZKJx4+v9rG/LwLKWMqmBZNWqYE5iVfdRNGEtRGkru+291MMjr0dcG2/Q1dgIGl
+u3gLz7m01Zemu1hdwOZkGgv5fAR3KrSPNGP6THEbFoDtXLtFmAthn92KgMLxwAuW
+ea32A1jdxU35GvI7yvq4TTDeJ/xKEL7ANXtzS78EuJE0JzjV3nbbHsE0E4fxK3jz
+IAD3loh6DGCddMqqsH4rdjVq3bWy2ieO8Qzt1kogVoH9vQIDAQABo0YwRDAjBgNV
+HREEHDAaghhwcmltdWxhd2ViLWZ1LnVhZG0udXUuc2UwHQYDVR0OBBYEFDZNF3mT
+IK6NUjq9YT0Vs+sm+6wPMA0GCSqGSIb3DQEBCwUAA4IBgQCzKXELLV4/x5YfT2Y8
+Jt5ihlfRh/MjbOJjAoMiVQpP7y81xYeW2vIfJ8vCequg6ArYs3bghSibMMPD2cSi
+9kz9BtpNdDE4Bo+MphJq9f9uvvNFpJdfIIFKRVHOyeHD0wOfSFw01bwyQ3KzngQ4
+I1QQhwO6JdzkeCB/F+MwuuZPZ2wDL9dnATznAWfk7DwJPCpk9d3EIbFsGVS9D9cT
+PU5t6s68/ysg866j9Mcw3zRWmUVJbYao5blhqyNyfewxekJZOccvY8dcuA0cbqPE
+4AAe/44uIIevcprWkVZjfFNk1ZCH3nFhhRhlcEHiuLvVdsXzBH/Wl4UJaz3G4JgF
+qGGC/0s2Qt0cdUe0bNX0XIgVev01w53Z+n4mpsiyobRApgvAp5hGLSAY3mt9vxUz
+NjUy+4nsmbSqctyZxay94bph4JBpvzNCpt17yg/zdcsc8xsnBdLl5IrNEUSVWr6J
+O5RRhRrqQ+FqWofyuV1dizmnxKVpfkF+9A1ro8WlITlzhxU=
+        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primulaweb-fu.uadm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets Primula UTV</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University Primula DEV</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>
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>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e711b04c..104b032d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -678,4 +678,6 @@
   <xi:include href="swamid-2.0/campuskort.uu.se-.xml"/>
   <xi:include href="swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml"/>
   <xi:include href="swamid-2.0/edumeet.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>