Resolves SWAMID-3132

3 files changed, 1 insertions, 116 deletions

diff --git a/swamid-2.0/jitsi.fhv.lu.se-shibboleth.xml b/swamid-2.0/jitsi.fhv.lu.se-shibboleth.xml
deleted file mode 100644
index b3ec9964..00000000
--- a/swamid-2.0/jitsi.fhv.lu.se-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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://jitsi.fhv.lu.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>
-    <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"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <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"/>
-    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Jitsi Meet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Jitsi Meet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Jitsi Meet videoconference for Occupational Health Service, Lund University</mdui:Description>
-        <mdui:Description xml:lang="sv">Jitsi Meet videokonferens hos Företagshälsovården, Lunds universitet</mdui:Description>
-      </mdui:UIInfo>
-      <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://jitsi.fhv.lu.se/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>lrtc726.srv.lu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrtc726.srv.lu.se</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIIEBTCCAm2gAwIBAgIUFymIotlxgwAU5hkeL4FbhJ6db68wDQYJKoZIhvcNAQEL
-            BQAwHDEaMBgGA1UEAxMRbHJ0YzcyNi5zcnYubHUuc2UwHhcNMjAwNTE4MDk1MjI0
-            WhcNMzAwNTE2MDk1MjI0WjAcMRowGAYDVQQDExFscnRjNzI2LnNydi5sdS5zZTCC
-            AaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALjvXqzmFMjQ11hl1sPZu/xk
-            MXP3LIFC3wkJpSvZH8oQzj8pTbckL3cy05ghnJaHGDxvxOI6jyTFsFU0iNlOwNyi
-            PeBPpHnwWTccWLExdprRJyZtewjo4AG1LiDzyQ+0uRf83U89/U1UGPs44NnwhKk+
-            kkKiVk+itCjZHWsSxO67alvXDq9o2Zxms/tYYaoAG46tmYEgO40VLbTRjSzKHSps
-            jY3b6KWJbp7BCeQU8asB5CZGlffqgn4/noKDdU41W71k5DHVnrv9/Ruh7rFP1LKO
-            XlYhqPJO9f3B3DxYfFAhrmd4iudIdCDH+diDDgyTJQos84/2UoOYdh2EnXrqQcqG
-            uHPZiEbgX8B8Uv8VKJCkOJm5vCD7xTl6ltA+SDXM49l2gWcuhqKQaKHsQZ7R7sy3
-            RRpOCkEGVUIqrBY/aWjdU+mhwdSdw3m9MYfT2YstHogv80Rc8sqYbD7xQeKf38je
-            y8uWHBHgg4ThlcjYThjsTx19kuQyLTwhP7sSdLqSkwIDAQABoz8wPTAcBgNVHREE
-            FTATghFscnRjNzI2LnNydi5sdS5zZTAdBgNVHQ4EFgQUsLk+PXzuvdumhRto62lA
-            /0aui7IwDQYJKoZIhvcNAQELBQADggGBAHMkIQKcKE+av5O/F40Ffj5mxcw/QfEd
-            3OH01PSQXfMZUDYqJq7x32NnzwK2giKvEbRmMpsaE8C/U5GZp1jmWNd0BHZQuolm
-            CHusrbUSoVKxfRQGEqc4xlthHVBInx/+9hLsHcLiOZfvXsm0mL4kT17g/yFcs9v8
-            6Qt0f6D/qX6npKsfzQVmVWNrmzipQuZGkRyIyFJdP2N1xI5P5+lew8tspr6mEVrL
-            6WDB5kLYaBs5L7/ovuDZkEbrtJ8YZFvKWW77exo8bN4cL86ryib4YVDT6EsGJATs
-            vFee+PIn9acfqBB9Tv4aZcp/+ODUt3h2vspWK2yBYjUbrCxTm6/gMTSTqwCVbIqY
-            B1Ze/cVqDN2N2usA5x9DgoA5GF8QLduW3fXCrOHUAMMVX06uSx8mPaGLgpriZD3K
-            1mKd2yeYWwbjxClBQCANoeNyTh4DQudDUSu8fNxbozeLMTRHCTbdPymWWSHsFM3T
-            C9+eE+IVn8c5azhoVPUFC1sS5betdMMa0Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <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://jitsi.fhv.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jitsi.fhv.lu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">LU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.lu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.lu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Abeer</md:GivenName>
-    <md:SurName>Kheder</md:SurName>
-    <md:EmailAddress>mailto:abeer.kheder@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Abeer</md:GivenName>
-    <md:SurName>Kheder</md:SurName>
-    <md:EmailAddress>mailto:abeer.kheder@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>LU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
index c3a8e68e..6ebcb68c 100644
--- a/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin-test-v4.kau.se-idp-shibboleth.xml
@@ -8,7 +8,7 @@
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-            <mdui:UIInfo>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Karlstads universitet v4 test</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Karlstad University v4 test</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Test Identity Provider för Karlstads universitet</mdui:Description>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 96b8f2bf..c472744e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -623,7 +623,6 @@
   <xi:include href="swamid-2.0/login.quicksearch.se-authservices.xml"/>
   <xi:include href="swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/id.easyvote.se-saml2-lucat.xml"/>
-  <xi:include href="swamid-2.0/jitsi.fhv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lis.ladok.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/myaccount.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/errorurl-sp-demo.swamid.se-shibboleth.xml"/>