SWAMID-912 Added demo.seamlessaccess.org demo.beta.seamlessaccess.org

4 files changed, 307 insertions, 1 deletions

diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh
index ec14b1ad..26534d3c 100755
--- a/scripts/get-metadata.sh
+++ b/scripts/get-metadata.sh
@@ -102,8 +102,8 @@ case $x in
 		fi
 
 		echo "$metadata" > $entityidfn
+		tmp=`mktemp`
 		if $update_xml ; then
-			tmp=`mktemp`
 			xsltproc --stringparam regDate "$regdate" $script_cwd/../xslt/add-rpi.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
 		fi
 		xsltproc $script_cwd/../xslt/clean-entitydescriptor.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
diff --git a/swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml b/swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml
new file mode 100644
index 00000000..c831b4bf
--- /dev/null
+++ b/swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml
@@ -0,0 +1,152 @@
+<?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://demo.beta.seamlessaccess.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-10T16:29:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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"/>
+  </md:Extensions>
+  <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://demo.beta.seamlessaccess.org/Shibboleth.sso/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://demo.beta.seamlessaccess.org/Shibboleth.sso/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://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/seamless-access"/>
+      <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://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/seamless-access" 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://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/thiss.io"/>
+      <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://demo.beta.seamlessaccess.org/Shibboleth.sso/DS/thiss.io" index="3"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Demosite for seamlessaccess.org</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Demosite for seamlessaccess.org</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Demosite for seamlessaccess.org</mdui:Description>
+        <mdui:Description xml:lang="en">Demosite for seamlessaccess.org</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://demo.beta.seamlessaccess.org/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://demo.beta.seamlessaccess.org/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://demo.beta.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://demo.beta.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUUCVFQS6x7CAmxA2HjzhtWPGxOOswDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
+NTEwMTEwMDM1WhcNMzIwNTA3MTEwMDM1WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
+YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AOHpIOoSmq/gaofQILX+ZCKqM/s9rMh+DXdDvS0C/yNgq38b+6vaT8e+LsI7W4SS
+1uvSltUH8UXz3INrMo96hUTjgDjS6a8D+XI+qr+cFo9B4e43BBOD/EtqGf0hYnvt
+mbddnVjajOK6Vj/vaaMondFlU65//BsKTb3G7Z8czOZn45/N0xcUSKu2tSHBHoav
+B9Dvr4jlLqwt2ZnuiTsK/B/MBC37gTKiQRFz8VptjGE+LPs6oNwJ3L7R3vho90+W
+uHPSS4+Ur5YuMhoT9KGMVMOofz4pB8bms0YtyQGqYY3zGPsWunaMTj/uKIQvAmxE
+Q79VsiOw0D/vWoL59v3UV540GUahT02hZvsvzWhMSStVWVYhAS2e/NYMlTAqHiH7
+QnN7Sp2DCnARdCyihm8yk1QVg4apaQPo7a5To4YJzTuXmb3cn+t7yGDJKuqRybXr
+v815gBKbsMh6hPGPhUwN7MsUnz0EmBuW9gNJMCCAuhtR0UtAcuseaXzgczL/My9J
+wIxUxllXqTdzi3H+9av4Ejw9jR+xbvCNorTbYLyZCgYb7f2CtSbp0OeqwEzDqQ7h
+fLyr4ia1P31zev9ZQji+CmIrKBLhX7bwftEmJoGZoZnz2e04tBtsWOB7Kdz0E/lj
+hTe3I6v8IqopvY63GoDvWwrB7t3qfzNCTmvse2VU1I93AgMBAAGjSDBGMCUGA1Ud
+EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBRs9ib4
+WTl39G7AaRY4NQvZxujnUTANBgkqhkiG9w0BAQsFAAOCAgEAWP+5qo2AeXtf2BXG
+5VASPhHi6e2JEH3yDfPXSBWpAluOn07+yz257yNw5um7lsTsIl+4TJF2qQGFrHCM
+/5hRg22ONP648wODatSbPYKP1H1dbnlL8yurw0XawzYakJdD5WrAICJ/Qy61DAXh
+0IT7F2Ez5UcmJbKW2ncWE9ZfZ//BYWKu+XOB3bVQJ5ReS+DBRJezLFZkVwQsHPzn
+Zanlfr+K+hadgGaHD+zyCl++Z4Ws9UHlhx1KaQnktPNtEMrdlHiPIGz7bYB/acRl
+tJytrxxRE1KslRxIeGMn04S+I5hUVVnQNC46Bemq8zOvZArcnCi451Ne1wNwUBTU
+qvxAEbw6mphuK460d+ZuxgTPNGlf2ggc38/F87saD5kR0f7HjuHjX9UNhxq1pLKm
+qvwSntNt7a2NjGZCOcWqKRoOKCm9N3nzf8xL/6vpqwCrb/Uv7VA1O6zwFK3SuQo7
+g8doBXjmrrrcMLv2an5xqUbAiW/d1hjLiBeAkQduMUi0IwJpIld4lRmD22diBlhI
++Mmvi2kdA9ojDAI+mWYl83aPzcH1oMXdiicrakBY1JZc6BmQPlJKIePVsz68DS27
+OlwG6rVaUIQrpdPUUyNcyoUyr7+czGxGh8KJG6N5gdUQNZ5n1MsIM7gzdYDTPNQx
+JFTDgHzXENHIUNh2t/vaR6jVeBA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUKSZvgEx+OK/LC6D8JGU52DHTOjswDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
+NTEwMTEwMDM3WhcNMzIwNTA3MTEwMDM3WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
+YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ANwzL8rMbf2N37IbEtZv8RZ+JhhOvfrasE0vTVBPrM1lBVY1PUsVFNT3k0ZxI8Rj
+MVIH+PLBr8r9vyAhVZIdinVPKvROXgZg42qj910UePVxrYNRta7QeFj67v0+cHKa
+ZMbH4Ja37+u9lbWwsnF+uGi56Vo1aDn+2V53qiZwkw161/nEab6T/j00ElrjFC9d
+KcPltZ5WGs7e1Nk9tONjXGAPaSIFuVOyAWWX/daFjBRZgDqCPCO5OTqyJgdE7rbO
+At7g8K3Pcas+bhkTUnSEmevCDTgVsKCMQ4mTavWvJaACnLjsPLYramoeF1cGTa2B
+QJ+NXsa/FGwkJ4/fzaPbCdPaXgQw3qEyImPm10+p/a7AXSvQcDEMQfDVq9hQvZur
+0UNUoeTpyXttYDLpyAstvQ2/OLz6o9rkSnlvL6KzsRWpT8gKuEIV2ZKKErrRJ52H
+hVFF+CFIRZqkKTlfSdRD0xd60RCWnNxU0q2Ewy0H6TR4Q496DmSMWBd3qYS4RHOK
+Q7WVVsH5VimgQh4skWQ/6TMau1niWoiNH+TI9eebvoj60er8C/8mvd9KvUWiWJL1
+EZxcq5S+8ny0TZo5mIrjnP44SrGOyLJ7y4aq0unIRrr0K5D7aBz3Xv97HXTwkeXp
+QjxKvOjfZ7iWEC5kkOFt0nNOf6nrckv3v0whN9eSS56jAgMBAAGjSDBGMCUGA1Ud
+EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBQN7mjh
+R1B/zhzZAZT+OCrkQi11czANBgkqhkiG9w0BAQsFAAOCAgEAILVcrHTgjKFru17X
+NqSeKGS97s6W0gFS/VrK1Il44S6abCsjWA6eUkTL3pc9QCeW1eVLCroGGhfpXxhF
+5unbm7msBJYtv/ugqLByJQRXp0N23aHpdvyucBGG5kD1XXPklkxJPyJxzMRXD7f+
+v0vybwz9mLR+HD5iRJoLrtdhhdS+OU9FKjgMaXHm+B9+rccZhwGmkwzI9rMdsdgO
+TjA7OXuN4Xiwxuli7sHlDkHLnuEkFvXb0qHAfyfa7H8Yu37/F564IWYDpzkIl7Ry
+LEm0ySLXD2H+ZKXv/Y0NxUV2PWbWv0//MH7rEjYgEsHsowr6IS3t8RhGybqbcA6A
+kQuEmzD7E2u/UgGx8GSIfXvjqR2G/ZNftbr4WSPgcARqYA9KZSvP6C/7yqMxL0d2
+l4wygfcHsTreVqyhlo+gxUMdX+xoPpvMxN1szha1owio9rJhQ7SjVkpyHgXq48yT
+Xqbm1xpoRZrdrfS2X96ESx5PHyNL97H/KUeIiJYcBlE5WYbTL0+iWo5ekDSt1J5z
+/3u1zxA127ttiVLoVyzIfZO7nIltujocDNFyYqjOhptmDCARrZIeGd/kalayu4Ow
+r8159vXCfYmNGBorfzZSG7tLoI8qlbDc1Feb2DHJrgSvCi8MYlwnssUitVHN9W/4
+bNqCPb5DTMATGYE2i3ASOHVdqfo=
+</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://demo.beta.seamlessaccess.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.beta.seamlessaccess.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SeamlessAccess.org</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SeamlessAccess.org</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">SeamlessAccess.org</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SeamlessAccess.org</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://seamlessaccess.org/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://seamlessaccess.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/demo.seamlessaccess.org-shibboleth.xml b/swamid-2.0/demo.seamlessaccess.org-shibboleth.xml
new file mode 100644
index 00000000..bb0b778b
--- /dev/null
+++ b/swamid-2.0/demo.seamlessaccess.org-shibboleth.xml
@@ -0,0 +1,152 @@
+<?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://demo.seamlessaccess.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-10T16:29:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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"/>
+  </md:Extensions>
+  <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://demo.seamlessaccess.org/Shibboleth.sso/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://demo.seamlessaccess.org/Shibboleth.sso/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://demo.seamlessaccess.org/Shibboleth.sso/DS/seamless-access"/>
+      <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://demo.seamlessaccess.org/Shibboleth.sso/DS/seamless-access" 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://demo.seamlessaccess.org/Shibboleth.sso/DS/thiss.io"/>
+      <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://demo.seamlessaccess.org/Shibboleth.sso/DS/thiss.io" index="3"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Demosite for seamlessaccess.org</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Demosite for seamlessaccess.org</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Demosite for seamlessaccess.org</mdui:Description>
+        <mdui:Description xml:lang="en">Demosite for seamlessaccess.org</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://demo.seamlessaccess.org/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://demo.seamlessaccess.org/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://demo.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://demo.seamlessaccess.org/?Privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUUCVFQS6x7CAmxA2HjzhtWPGxOOswDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
+NTEwMTEwMDM1WhcNMzIwNTA3MTEwMDM1WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
+YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AOHpIOoSmq/gaofQILX+ZCKqM/s9rMh+DXdDvS0C/yNgq38b+6vaT8e+LsI7W4SS
+1uvSltUH8UXz3INrMo96hUTjgDjS6a8D+XI+qr+cFo9B4e43BBOD/EtqGf0hYnvt
+mbddnVjajOK6Vj/vaaMondFlU65//BsKTb3G7Z8czOZn45/N0xcUSKu2tSHBHoav
+B9Dvr4jlLqwt2ZnuiTsK/B/MBC37gTKiQRFz8VptjGE+LPs6oNwJ3L7R3vho90+W
+uHPSS4+Ur5YuMhoT9KGMVMOofz4pB8bms0YtyQGqYY3zGPsWunaMTj/uKIQvAmxE
+Q79VsiOw0D/vWoL59v3UV540GUahT02hZvsvzWhMSStVWVYhAS2e/NYMlTAqHiH7
+QnN7Sp2DCnARdCyihm8yk1QVg4apaQPo7a5To4YJzTuXmb3cn+t7yGDJKuqRybXr
+v815gBKbsMh6hPGPhUwN7MsUnz0EmBuW9gNJMCCAuhtR0UtAcuseaXzgczL/My9J
+wIxUxllXqTdzi3H+9av4Ejw9jR+xbvCNorTbYLyZCgYb7f2CtSbp0OeqwEzDqQ7h
+fLyr4ia1P31zev9ZQji+CmIrKBLhX7bwftEmJoGZoZnz2e04tBtsWOB7Kdz0E/lj
+hTe3I6v8IqopvY63GoDvWwrB7t3qfzNCTmvse2VU1I93AgMBAAGjSDBGMCUGA1Ud
+EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBRs9ib4
+WTl39G7AaRY4NQvZxujnUTANBgkqhkiG9w0BAQsFAAOCAgEAWP+5qo2AeXtf2BXG
+5VASPhHi6e2JEH3yDfPXSBWpAluOn07+yz257yNw5um7lsTsIl+4TJF2qQGFrHCM
+/5hRg22ONP648wODatSbPYKP1H1dbnlL8yurw0XawzYakJdD5WrAICJ/Qy61DAXh
+0IT7F2Ez5UcmJbKW2ncWE9ZfZ//BYWKu+XOB3bVQJ5ReS+DBRJezLFZkVwQsHPzn
+Zanlfr+K+hadgGaHD+zyCl++Z4Ws9UHlhx1KaQnktPNtEMrdlHiPIGz7bYB/acRl
+tJytrxxRE1KslRxIeGMn04S+I5hUVVnQNC46Bemq8zOvZArcnCi451Ne1wNwUBTU
+qvxAEbw6mphuK460d+ZuxgTPNGlf2ggc38/F87saD5kR0f7HjuHjX9UNhxq1pLKm
+qvwSntNt7a2NjGZCOcWqKRoOKCm9N3nzf8xL/6vpqwCrb/Uv7VA1O6zwFK3SuQo7
+g8doBXjmrrrcMLv2an5xqUbAiW/d1hjLiBeAkQduMUi0IwJpIld4lRmD22diBlhI
++Mmvi2kdA9ojDAI+mWYl83aPzcH1oMXdiicrakBY1JZc6BmQPlJKIePVsz68DS27
+OlwG6rVaUIQrpdPUUyNcyoUyr7+czGxGh8KJG6N5gdUQNZ5n1MsIM7gzdYDTPNQx
+JFTDgHzXENHIUNh2t/vaR6jVeBA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>sp-test.seamlessaccess.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.seamlessaccess.org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUKSZvgEx+OK/LC6D8JGU52DHTOjswDQYJKoZIhvcNAQEL
+BQAwJTEjMCEGA1UEAxMac3AtdGVzdC5zZWFtbGVzc2FjY2Vzcy5vcmcwHhcNMjIw
+NTEwMTEwMDM3WhcNMzIwNTA3MTEwMDM3WjAlMSMwIQYDVQQDExpzcC10ZXN0LnNl
+YW1sZXNzYWNjZXNzLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ANwzL8rMbf2N37IbEtZv8RZ+JhhOvfrasE0vTVBPrM1lBVY1PUsVFNT3k0ZxI8Rj
+MVIH+PLBr8r9vyAhVZIdinVPKvROXgZg42qj910UePVxrYNRta7QeFj67v0+cHKa
+ZMbH4Ja37+u9lbWwsnF+uGi56Vo1aDn+2V53qiZwkw161/nEab6T/j00ElrjFC9d
+KcPltZ5WGs7e1Nk9tONjXGAPaSIFuVOyAWWX/daFjBRZgDqCPCO5OTqyJgdE7rbO
+At7g8K3Pcas+bhkTUnSEmevCDTgVsKCMQ4mTavWvJaACnLjsPLYramoeF1cGTa2B
+QJ+NXsa/FGwkJ4/fzaPbCdPaXgQw3qEyImPm10+p/a7AXSvQcDEMQfDVq9hQvZur
+0UNUoeTpyXttYDLpyAstvQ2/OLz6o9rkSnlvL6KzsRWpT8gKuEIV2ZKKErrRJ52H
+hVFF+CFIRZqkKTlfSdRD0xd60RCWnNxU0q2Ewy0H6TR4Q496DmSMWBd3qYS4RHOK
+Q7WVVsH5VimgQh4skWQ/6TMau1niWoiNH+TI9eebvoj60er8C/8mvd9KvUWiWJL1
+EZxcq5S+8ny0TZo5mIrjnP44SrGOyLJ7y4aq0unIRrr0K5D7aBz3Xv97HXTwkeXp
+QjxKvOjfZ7iWEC5kkOFt0nNOf6nrckv3v0whN9eSS56jAgMBAAGjSDBGMCUGA1Ud
+EQQeMByCGnNwLXRlc3Quc2VhbWxlc3NhY2Nlc3Mub3JnMB0GA1UdDgQWBBQN7mjh
+R1B/zhzZAZT+OCrkQi11czANBgkqhkiG9w0BAQsFAAOCAgEAILVcrHTgjKFru17X
+NqSeKGS97s6W0gFS/VrK1Il44S6abCsjWA6eUkTL3pc9QCeW1eVLCroGGhfpXxhF
+5unbm7msBJYtv/ugqLByJQRXp0N23aHpdvyucBGG5kD1XXPklkxJPyJxzMRXD7f+
+v0vybwz9mLR+HD5iRJoLrtdhhdS+OU9FKjgMaXHm+B9+rccZhwGmkwzI9rMdsdgO
+TjA7OXuN4Xiwxuli7sHlDkHLnuEkFvXb0qHAfyfa7H8Yu37/F564IWYDpzkIl7Ry
+LEm0ySLXD2H+ZKXv/Y0NxUV2PWbWv0//MH7rEjYgEsHsowr6IS3t8RhGybqbcA6A
+kQuEmzD7E2u/UgGx8GSIfXvjqR2G/ZNftbr4WSPgcARqYA9KZSvP6C/7yqMxL0d2
+l4wygfcHsTreVqyhlo+gxUMdX+xoPpvMxN1szha1owio9rJhQ7SjVkpyHgXq48yT
+Xqbm1xpoRZrdrfS2X96ESx5PHyNL97H/KUeIiJYcBlE5WYbTL0+iWo5ekDSt1J5z
+/3u1zxA127ttiVLoVyzIfZO7nIltujocDNFyYqjOhptmDCARrZIeGd/kalayu4Ow
+r8159vXCfYmNGBorfzZSG7tLoI8qlbDc1Feb2DHJrgSvCi8MYlwnssUitVHN9W/4
+bNqCPb5DTMATGYE2i3ASOHVdqfo=
+</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://demo.seamlessaccess.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.seamlessaccess.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SeamlessAccess.org</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SeamlessAccess.org</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">SeamlessAccess.org</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SeamlessAccess.org</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://seamlessaccess.org/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://seamlessaccess.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 8530fa1a..cad5b5d7 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -47,4 +47,6 @@
   <xi:include href="swamid-2.0/drive-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/secure.ouriginal.com.xml"/>
   <xi:include href="swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/demo.seamlessaccess.org-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/demo.beta.seamlessaccess.org-shibboleth.xml"/>
 </md:EntitiesDescriptor>