SWAMID-575, Added CoCo to fs.liu.se and fs.test.ad.liu.se

2 files changed, 240 insertions, 178 deletions

diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 44ffc69d..da762661 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -5,41 +5,42 @@
       <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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla: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-support">
         <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>
-      <samls:Attribute xmlns:samls="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">
-        <samls:AttributeValue>http://www.swamid.se/category/hei-service</samls:AttributeValue>
-        <samls:AttributeValue>http://www.swamid.se/category/research-and-education</samls:AttributeValue>
-        <samls:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samls:AttributeValue>
-      </samls: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" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
         <mdui:Description xml:lang="en">Linköping University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDLTCCAhWgAwIBAgIQFPektIXgbZRBYUGmou4GaDANBgkqhkiG9w0BAQsFADAb
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQFPektIXgbZRBYUGmou4GaDANBgkqhkiG9w0BAQsFADAb
 MRkwFwYDVQQDDBBmc3NpZ25pbmcubGl1LnNlMB4XDTE3MTIxNTA3NDM0N1oXDTI3
 MTIxNTA3NTM0N1owGzEZMBcGA1UEAwwQZnNzaWduaW5nLmxpdS5zZTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALbCDIqrM4xMhU9tKSgJaDyK+JGWw/lH
@@ -56,14 +57,14 @@ G8N7PUL+TzqqVCpsk56BJeg3399mJ610S41x8b27hw6icz95mBWdTztScjyJYg6n
 /hQYf48auRXMVUTJ8ckUl72/NWrQvZ3XouyNV9S2A3DC1qtCF875TipSxbUOM2V7
 7GwXH2sdanMfhsGQYoTsZ5qE0qnjuQWVDiRnOMnvRnvzDAlCKjRtAqGlOLMOIHLq
 u8bHcIBe4v+veexfA6vNpgY75s2JxiNUDN6BEHmvl4q0e9M30gZl5SjvG2o/9A8z
-sw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDLTCCAhWgAwIBAgIQXl+Ab5+AALlEmUMLnaw2ajANBgkqhkiG9w0BAQsFADAb
+sw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQXl+Ab5+AALlEmUMLnaw2ajANBgkqhkiG9w0BAQsFADAb
 MRkwFwYDVQQDDBBmc2RlY3J5cHQubGl1LnNlMB4XDTE3MTIxNTA3NDAyN1oXDTI3
 MTIxNTA3NTAyOFowGzEZMBcGA1UEAwwQZnNkZWNyeXB0LmxpdS5zZTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+KCOjlPhfT4jLdwPf3CH7FRfA7dvWk
@@ -80,32 +81,41 @@ PEW3cacq/MatOMkj+RfQXeibYqEzNkluv5aS/O/v2dYAMop8IuOdriyu5uDsbBsV
 y76yLQQ+F40IPHZH4Si9bXQSaydlxSSjT9MNmHIMw3swUTYfxecsNJdaW8Vq4EXc
 3Qfa07tt/bO9U7O2HPPViIxlgO8Np5FEfzjD0TxJ5TgnU1lb795nZIAbvzSGULdS
 uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
-3w==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
-  </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-prod-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <Extensions>
+3w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Linköping University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Linköpings universitet</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-prod-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
+    <md:Extensions>
       <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
         <mdui:Keywords xml:lang="en">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>liu.se</mdui:DomainHint>
@@ -113,11 +123,11 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
         <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
         <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDLTCCAhWgAwIBAgIQFPektIXgbZRBYUGmou4GaDANBgkqhkiG9w0BAQsFADAb
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQFPektIXgbZRBYUGmou4GaDANBgkqhkiG9w0BAQsFADAb
 MRkwFwYDVQQDDBBmc3NpZ25pbmcubGl1LnNlMB4XDTE3MTIxNTA3NDM0N1oXDTI3
 MTIxNTA3NTM0N1owGzEZMBcGA1UEAwwQZnNzaWduaW5nLmxpdS5zZTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALbCDIqrM4xMhU9tKSgJaDyK+JGWw/lH
@@ -134,14 +144,14 @@ G8N7PUL+TzqqVCpsk56BJeg3399mJ610S41x8b27hw6icz95mBWdTztScjyJYg6n
 /hQYf48auRXMVUTJ8ckUl72/NWrQvZ3XouyNV9S2A3DC1qtCF875TipSxbUOM2V7
 7GwXH2sdanMfhsGQYoTsZ5qE0qnjuQWVDiRnOMnvRnvzDAlCKjRtAqGlOLMOIHLq
 u8bHcIBe4v+veexfA6vNpgY75s2JxiNUDN6BEHmvl4q0e9M30gZl5SjvG2o/9A8z
-sw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDLTCCAhWgAwIBAgIQXl+Ab5+AALlEmUMLnaw2ajANBgkqhkiG9w0BAQsFADAb
+sw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLTCCAhWgAwIBAgIQXl+Ab5+AALlEmUMLnaw2ajANBgkqhkiG9w0BAQsFADAb
 MRkwFwYDVQQDDBBmc2RlY3J5cHQubGl1LnNlMB4XDTE3MTIxNTA3NDAyN1oXDTI3
 MTIxNTA3NTAyOFowGzEZMBcGA1UEAwwQZnNkZWNyeXB0LmxpdS5zZTCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+KCOjlPhfT4jLdwPf3CH7FRfA7dvWk
@@ -158,46 +168,46 @@ PEW3cacq/MatOMkj+RfQXeibYqEzNkluv5aS/O/v2dYAMop8IuOdriyu5uDsbBsV
 y76yLQQ+F40IPHZH4Si9bXQSaydlxSSjT9MNmHIMw3swUTYfxecsNJdaW8Vq4EXc
 3Qfa07tt/bO9U7O2HPPViIxlgO8Np5FEfzjD0TxJ5TgnU1lb795nZIAbvzSGULdS
 uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
-3w==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Linköpings universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Linköping University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://liu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://liu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
-    <TelephoneNumber>+46 13 282828</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>LiU Incident Response Team</GivenName>
-    <EmailAddress>mailto:abuse@liu.se</EmailAddress>
-    <TelephoneNumber>+46 13 281744</TelephoneNumber>
-  </ContactPerson>
+3w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Linköping University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Linköping University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://liu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://liu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>LiU Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 281744</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
index 28710b7c..f95a0d20 100644
--- a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
@@ -5,90 +5,142 @@
       <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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla: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-support">
         <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>
-      <samls:Attribute xmlns:samls="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">
-        <samls:AttributeValue>http://www.swamid.se/category/hei-service</samls:AttributeValue>
-        <samls:AttributeValue>http://www.swamid.se/category/research-and-education</samls:AttributeValue>
-        <samls:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samls:AttributeValue>
-      </samls: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" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.test.ad.liu.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-test-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
+        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.test.ad.liu.se/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Linköping University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Linköpings universitet</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-test-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet Test (ADFS)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University Test (ADFS)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Linköpings universityet Test (ADFS)</mdui:Description>
-        <mdui:Description xml:lang="en">Linköping University Test (ADFS)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">LIU Linköping+University</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LIU Linköping+University</mdui:Keywords>
+        <mdui:DisplayName xml:lang="sv">Linköpings universitet Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
+        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.liu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">LIU Linköping University</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">LIU Linköping University</mdui:Keywords>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.test.ad.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Linköpings universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings universitet Test (ADFS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">https://liu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://liu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Saml</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-    <TelephoneNumber>+46 13 282828</TelephoneNumber>
-  </ContactPerson>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>liu.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.test.ad.liu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Linköping University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Linköping University Test</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://liu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://liu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Linköping University</md:Company>
+    <md:GivenName>Saml</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.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>LiU Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 281744</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>