From 15523c31695638569b39a1d5d169c6a045f710d7 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Sun, 29 Mar 2020 16:03:20 +0000
Subject: Resolves SWAMID-2772

---
 swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
index b4bc1b05..f7055a33 100644
--- a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
+++ b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
@@ -4,12 +4,6 @@
     <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.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -26,15 +20,20 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">lap559t.bmc.lu.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">lap559t.bmc.lu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testmiljö för RedCap</mdui:Description>
-        <mdui:Description xml:lang="en">Test env for RedCap</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">lap559t</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">lap559t</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test-server för RedCap</mdui:Description>
+        <mdui:Description xml:lang="en">Test-server for RedCap</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -120,14 +119,16 @@ dl48KQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
-    <md:SurName>Rikard Johansson</md:SurName>
-    <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
+    <md:SurName>Hans Nielsen</md:SurName>
+    <md:EmailAddress>mailto:hans.nielsen@med.lu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:SurName>Rikard Johansson</md:SurName>
-    <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
+    <md:SurName>Hans Nielsen</md:SurName>
+    <md:EmailAddress>mailto:hans.nielsen@med.lu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:SurName>Rikard Johansson</md:SurName>
-- 
cgit v1.2.3