From 3f3af34db33637c7aa525c749b9f0df36340294f Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Wed, 24 Jun 2020 13:11:47 +0200
Subject: Resolves SWAMID-3120

---
 swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml | 36 ++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml b/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml
index 578942ca..786b949a 100644
--- a/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml
@@ -22,22 +22,23 @@
     <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://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <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:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://lis.ladok.test.sunet.se/Shibboleth.sso/DS/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <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://lis.ladok.test.sunet.se/Shibboleth.sso/Loginx"/>
+      <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://lis.ladok.test.sunet.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/DS/swamid-test" index="2"/>
       <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://lis.ladok.test.sunet.se/Shibboleth.sso/UMU"/>
+      <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://lis.ladok.test.sunet.se/Shibboleth.sso/Loginx"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Testsystem för canvas-lis vid Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Testsystem for canvas-lis at Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Logsystem</mdui:Description>
-        <mdui:Description xml:lang="en">Logsystem</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Administrationsverktyg Ladok-Lis integration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Administrative tool for Ladok-Lis integration</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Logverktyg för hanterade händelser</mdui:Description>
+        <mdui:Description xml:lang="en">Log viewer for handled events</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -72,7 +73,7 @@ nEwOTYTTy3bWuySCHbAcLFoRbAEQmRvlPk/sWU9cCUaLmTxRVkmr1s1UbZJNVPhX
 rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz
 1F4EXgMOYoaMf/hN6D9Jrvxz26240P577lU5lbkmyI/OrV8zIc+XYMC7wune5hNz
 0/bNyIzo
-					</ds:X509Certificate>
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -86,14 +87,15 @@ rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tommy</md:GivenName>
+    <md:SurName>Larsson</md:SurName>
+    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3