Resolves SWAMID-3721

4 files changed, 98 insertions, 23 deletions

diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index 9524b4f6..0b87c793 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -17,3 +17,4 @@ swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xm
 swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
 swamid-2.0/moodle.media.nordu.net-.xml
 swamid-2.0/www.service4mobility.com-mobility_su_se.xml
+swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
diff --git a/swamid-2.0/edusign-test.ju.se-shibboleth.xml b/swamid-2.0/edusign-test.ju.se-shibboleth.xml
new file mode 100644
index 00000000..82b5ab63
--- /dev/null
+++ b/swamid-2.0/edusign-test.ju.se-shibboleth.xml
@@ -0,0 +1,73 @@
+<?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://edusign-test.ju.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://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 urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="sv">Underskriftstjänst för eduSign - Test</mdui:Description>
+        <mdui:Description xml:lang="en">eduSign signing service - Test</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Jönköping University unserskriftstjänst - Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University signing service - Test</mdui:DisplayName>
+        <mdui:Logo xml:lang="sv" height="140" width="315">https://idp.hj.se/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIECDCCAnCgAwIBAgIUKbijdK4S+dyn9nvB3EWRfsaMEFYwDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSZWR1c2lnbi10ZXN0Lmp1LnNlMB4XDTIxMDEyMjEyMzkw
+MloXDTMxMDEyMDEyMzkwMlowHTEbMBkGA1UEAxMSZWR1c2lnbi10ZXN0Lmp1LnNl
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA5p7TGwnv+b4ccAXfsPrk
+eUCgGtsGLmzh+EXwinH1cQm8php58Pv2Y1Jg00qU8WJDl31CsBPQpr+HQa83p8eP
+2r92Lj7BK43Xtni3yN8k4a1bHJsosvWm0qmZ590lRblpqPrZhbcf+RKwwSUKmCSw
+hwYDMC2ih3HADqFaPMYJ8NnXRfVZimSNrA8zv9/uyP6HE1691tdp9QPTq/9khMUj
+xg6HEs46ALRel4Wgb4/DSxLqlKs80J1c5EKVNE7bi20OvdM205VA0cbgi+bEdsd9
+pe4+N+FP12J+UK0/Ttz8DbE+UEQd+0e7tZPyEzNR5NgilPvNz9z2gYljMKtnASGm
+m7N10TTR7JWoEK5mgNALnB1GOHChJBuclkOewuSSNycd8oUvPXlJsSElYQNoNeln
+oKDv/vKR17uTIroifgdQsPc7uLNMeooDVz5b2koItN5DnT4JpBv8ofnI1Q+QaNam
+/Fwxn3QzmD6heZ0G2pi5HPJYDi3pJYRe8g/vURKkEiLPAgMBAAGjQDA+MB0GA1Ud
+EQQWMBSCEmVkdXNpZ24tdGVzdC5qdS5zZTAdBgNVHQ4EFgQUerOsiFlMO8Ul1EuR
+o2K6SsH7YZcwDQYJKoZIhvcNAQELBQADggGBADtPnla1WDrxOfr6wZao49J2mXw1
+vuJj7PU5En1F0hdV6W5FaBJJfGGzjuTuyKkUin20E9NOoW4yzLB/Fd8p0WGY/4hu
+ot2wHzjlz9ytA4BaLg3+VjYj8QmQTdiUI+PfUoTqAjsGOci2qqhWts2DfRihBXd0
+oiggygTE2xdb6GmJlR2+iU0kOyRv8Jq4Wn7pmEv9jIjN7dLhaq90jXmacuBbqmKZ
+xwtxEAoLYNvJvcee4aPHr/RocC/a1LR7siaUjwwbnMFmDjrY6i+aHwH3uONnDkW3
+Q3asMhxztekN8fj626JWAiodkGcFR752Gm23E+YwBls3szC+loWJl3UYvIxmFBR+
+GFbHufEcYh+3s+hx1o0CI7oUlb4WWmoNSBb2S+MY56OiU1qNpT6aSHT9xuR31hKM
+qxCHLKQZ+UHG5YEOUL7FR4+fnYg0Tvhj/BOkL3muNso9jOoGJcfQNXmHCqe9Q8Ek
+Z0Qe4jI1CMPyaQ7yqlM1W+c4mq+QqBetXFo7Ng==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edusign-test.ju.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edusign-test.ju.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edusign-test.ju.se/Shibboleth.sso/SAML/POST" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jönköping University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Jönköping University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Jönköping University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ju.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:swamid@ju.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/edusign.ju.se-shibboleth.xml b/swamid-2.0/edusign.ju.se-shibboleth.xml
index 324d010e..c6e45551 100644
--- a/swamid-2.0/edusign.ju.se-shibboleth.xml
+++ b/swamid-2.0/edusign.ju.se-shibboleth.xml
@@ -24,29 +24,29 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-                        MIID+TCCAmGgAwIBAgIUcvK7l55W4ym/iRGSI3Ey8jYbqoQwDQYJKoZIhvcNAQEL
-                        BQAwGDEWMBQGA1UEAxMNZWR1c2lnbi5qdS5zZTAeFw0yMDA2MjUxMjMzMTlaFw0z
-                        MDA2MjMxMjMzMTlaMBgxFjAUBgNVBAMTDWVkdXNpZ24uanUuc2UwggGiMA0GCSqG
-                        SIb3DQEBAQUAA4IBjwAwggGKAoIBgQC3bDyEsKNGbyQeyKFETVT7+uPc/gaisUf/
-                        NGyKf/T795KnOuf44cbJfLdZoIW604yoUcneADxDWPc+ywU6y47YxAOlbMRvf/16
-                        kn/bn8hLvvK/gtzsMlAuocOvc2jPeYhB8uFJ180CPj4N3HWi8QOzkE/b8lEd9RFX
-                        0+xsWPE8mjHbYe4FqXznSQ79W4ntzHEZQOnAsEojFnuRyzrdElBAm8TKh4yFFs+u
-                        5GkiuA3flBexea2rB0qGhGd/w2nOs4NpY9v/wLll9JyKiW7pEHUlf58S57x+XEnQ
-                        mDcXRMFKk5hlB0phE2kCxFTcGyK6kGprmdNvGUVJYJYkh1dOMX98cD9YP8F6w6qf
-                        zHhFRFf0KfM83uxHjBnmV2y71YTzBf5kxl0C4YuZcQKv8eSvEEnf7u5w5ST+7nb/
-                        qG+rn6ofcAzjd9ZFrMICFXESwzb2YApKBFfKr+E14ZSQRgxYiKmScklSryjpbPZT
-                        V3B2E5hOFQRMNtZEPQvZoYztzXEnNUcCAwEAAaM7MDkwGAYDVR0RBBEwD4INZWR1
-                        c2lnbi5qdS5zZTAdBgNVHQ4EFgQUHqymrkhDoT2473RDzUsOVbkRGoIwDQYJKoZI
-                        hvcNAQELBQADggGBAHUbIWHYnWsJIP3+SaAuTfOHgMFI7DudyTQUzE4beERhQ9nd
-                        vRs6sJnkjPlWXFpTJYHuechPwuq07YHxV1MOHkB3PnYVIu9J07b4eRWNTXshzIA7
-                        7j9fF0eNiUTyWqvB/6YozTyXz/TcjjgdcKleDGc6sJorjU/d+dxG5eCAoLxUFEFB
-                        Fxt3GVlN4c5QrylEbXWOfLEUnLBhNTdi1woG5YGa3fL7KGzvydLKUIvszWyky7+7
-                        ec6Y2pv0To6LerZYuK5e1E9symXeNzaqwQoDbSwaLjmIeri0MVn61Rq8CUhcfjYE
-                        mIjgF8a4b313+sxsBt76UFpoYOu7qPNvlPyhz+Ay4zsZgkJAzO7rLHrTdtUBWprE
-                        aVVXdLulwxNMNS4htUCdMyIguEN7lPVRO+jJTQWr+nNlj6LQyEKSzr7gDEJ+gbvk
-                        fzjN4+V8sByizshLpx7Izv+yp3r6UPbTekxej7lnTeZtj33kPn/6EWGoEvqJ+OVh
-                        X9ctj7sJm6MBmITb8A==
-                    </ds:X509Certificate>
+MIID+TCCAmGgAwIBAgIUZJotR9W/dJdrkeDIrhXnN+LigmIwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAxMNZWR1c2lnbi5qdS5zZTAeFw0yMTAxMjIxMjU3MjBaFw0z
+MTAxMjAxMjU3MjBaMBgxFjAUBgNVBAMTDWVkdXNpZ24uanUuc2UwggGiMA0GCSqG
+SIb3DQEBAQUAA4IBjwAwggGKAoIBgQDlvhWM0pMKRoLkeMFTnB5McdJNaFWCkZqt
+6OTNVcyl97Oa1Ov0WOPfmu4HUnoAUNnT4YldY7rl++vfED5keat1C/cqTq25uzGV
+ShT+IHofh/qfqpe30MWbHTX/KmCY6EuQiCemYrVZARo8sSIP8WP+xxL2t+YXjB0/
+U5aHBBJYpdFASWsRggFix4vLR7juPClNGdzsFi8uUgsOXYK7WFuH88HA2PXouQ2q
+awRNgYPraNV6xejLV+lAp8p8QxwPxBcb3Zq4S/OZJXBkACSrHKKZkjcqLJfQznHp
+hwmcJ6nDXOrzrt1IwmQg5jtm2K+uIfg7CE5Pr87axEdSaMg/u6T1B7LXD33cK8mZ
+ElGlvSx8xsUh42i9QrgkZnZ3xt7BkTWQGe6XCUjpQsVTafxPnRYrANBf06Uo7il2
+/pt+Ru6/8y+rtk9zSCn9HFlnk8b2jcGq3aCeK9Z7I5ql4Eme9yj5jlqsytkKyaqk
+HOUoG0dIi1xc86Vsd1Nh0A8WoxkeWuUCAwEAAaM7MDkwGAYDVR0RBBEwD4INZWR1
+c2lnbi5qdS5zZTAdBgNVHQ4EFgQUxzfdX3+5RGIy9mhSbUt2xnzDFtIwDQYJKoZI
+hvcNAQELBQADggGBAJzWcgC24Z4LmNksQ8hl87ndJ1NcKac7Pfw++5895HdWZrw5
+SxM/8mk91Mcnj65IQFjGOQTlZFlWJpKBqXoGOles4eBogViE2GoNydBDSffPGmpZ
+ZN/Z/1LdJwibiT13eVCMoHIyRMr0HpBfLKP3wATHmRZ/R+B6dAsu4cNvmocfFv25
+eOEDSZBJF2Jl8ivD4Y4tt6Y8NxEfBt16dsfVUbuDW571ARTKLUFXY/6HU254Dkue
+S1llIu+JmXh0/FUTlpUlO9icvWyZSHouC9oZ2R+MQRJOqtE0gTQcvJThslMkb98B
+9Xrh/Jr3XjzeCvzHK5Hhl7xT5lwu3RJSHv1UsOYCllMqcuwSlBe7W1Eltkb5wL1e
+/Zkm90HQpURcVwheEsrHdZtxXPKMJ9/XcWmdKbQCzjCbn8zgv3/QawXy7rR+7sIN
+Tm10VZAlOkvxgJn5nfe521oLGbfK9HUVe4o1nIK57uv+mKOTtXU2qMr3uJw+voDK
+eZqzF27SgMhl3442WA==
+          </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b3948ac7..4afdb482 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -676,4 +676,5 @@
   <xi:include href="swamid-2.0/assemblage.dc.kau.se.xml"/>
   <xi:include href="swamid-2.0/play.konstfack.se.xml"/>
   <xi:include href="swamid-2.0/www3.kau.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/edusign-test.ju.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>