Merge branch 'master' of md-master.swamid.se:swamid-metadata

Conflicts:
	swamid-sp-2.0.mxml

6 files changed, 225 insertions, 17 deletions

diff --git a/swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml b/swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..cee2f6c8
--- /dev/null
+++ b/swamid-2.0/gul.gu.se-shibboleth.sso-metadata.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gul.gu.se/Shibboleth.sso/Metadata">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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://gul.gu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>gul-vas-2.it.gu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=gul-vas-2.it.gu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJALYbwahQyyIIMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmd1bC12YXMtMi5pdC5ndS5zZTAeFw0xNDA0MDgxOTU4MTNaFw0yNDA0MDUx
+OTU4MTNaMB0xGzAZBgNVBAMTEmd1bC12YXMtMi5pdC5ndS5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAO4HNuW9cvbXvO32s9g5gbPuzVpNUyBw80Sw
+uCJAMpXMBBRPyZArvjFlr62ZqfTBmmabPlXkMEUFt0oeHowaxFXdya2W6blyTfnL
+64sm4SEFPjEKrh4wbhuQNsW/xV0+49qvxObZKo/6mHlXvCvKJXxMGWBJuRskDiM7
+xV6qZBg9Y7a7FSqbq/2ENsvvKCrJ9sX83KszmOrFL2OvNXiKRL7nsaYVskU8zxwV
+gMZ6JRIK9bP48iZ/DNzVXL9BUaXz0Q9QXRMU1A7FutTRIZSripolGPK4bt5KgnWw
+viF5nAVp+614pLA+8hOV3SvG+j75YLFP8lzc2oy/o6az02Zf2dkCAwEAAaNAMD4w
+HQYDVR0RBBYwFIISZ3VsLXZhcy0yLml0Lmd1LnNlMB0GA1UdDgQWBBStqvU8e7JE
+t49WvWQDS4l78RLMvzANBgkqhkiG9w0BAQUFAAOCAQEAH6VPWqikKFA3d2daVKNd
+c6lKSFhikVHsuCwCqaKCwPwv8JSeAoJpaECf6y30F8oO/BYqT52ysJCViZ0SJkeV
+1B6W3mrJprkKcUXYHtMFw5xiREk8YtKXk2s6ILJ/qhGtACbn58J2UbXyMsU7QLDs
+82Enh/eyzIor62rd4L/Xar9Vfn1bDvi8adgEgjW4F8EgF8kgvSdcEBHkw7P4xg1z
+XigPY/3UZL0+3jurVuXrXLAg9pvpvAAlhyE1zpIx1+YuaBqXiz1SbgoZFEGciBkN
+eL3wuo++huqzzBLsQtdaANbAUEnMDFcPOKT2x4/MCStbcNtz6e7VSVX2lU+wkeK3
+ow==
+</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gul.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index fdec7017..b0685db8 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -629,6 +629,15 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns="" regexp="false">suni.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ny Identitetshanterare för Södertörns högskola</mdui:Description>
+        <mdui:Description xml:lang="en">New Identity Provider for Södertörn University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index ae28e676..ff589283 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.irf.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
@@ -94,8 +101,8 @@ XCYbfP8E3cs4MB+K
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">IRF</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik (gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index 0dffd552..a2279075 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idpshibboleth.irf.se/idp/shibboleth">
-  <Extensions>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
-  </Extensions>
   <IDPSSODescriptor 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">irf.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik (ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
+        <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>irf.se</mdui:DomainHint>
+        <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
+        <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -187,14 +196,26 @@ CQNfH97cIrTE5N/RQ7XWcw==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">IRF</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik (ny)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics (new)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Swedish Institute of Space Physics</Company>
+    <SurName>Mats Luspa</SurName>
+    <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
+    <TelephoneNumber>+4698079000</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>Institutet för rymdfysik</Company>
+    <Company>Swedish Institute of Space Physics</Company>
+    <SurName>Mats Luspa</SurName>
+    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
+    <TelephoneNumber>+4698079022</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
     <EmailAddress>mailto:matsl@irf.se</EmailAddress>
-    <TelephoneNumber>+46 980 79 022</TelephoneNumber>
+    <TelephoneNumber>+4698079022</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
new file mode 100644
index 00000000..eeec5609
--- /dev/null
+++ b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
@@ -0,0 +1,35 @@
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#" entityID="https://kaltura.saas-idp-test.swamid.se/Saml2/proxy_saml2_backend.xml"><ns0:Extensions><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160" /><ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" /><ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160" /><ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" /></ns0:Extensions><ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:Extensions><ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saas-idp-test.swamid.se/Saml2/disco" index="1" /></ns0:Extensions><ns0:KeyDescriptor use="signing"><ns3:KeyInfo><ns3:X509Data><ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
+MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
+kBBZbZTpzSrVNhvvL6oa4c/vyhYh7Ba67JB35oQ7tjcf4YfLMs2N9YI1OVDX+FO+
+RebZedVNDcUVzqEkLN2rtwRwtniesEMxiRxwEh4CAo8GFy1LeZAc5QtZiJdFNWs5
+tfYTa2WmD++inPf3SymtDjbcB1pAAjLO5lxJoEVXTIZnAiqbvKfQvZpUSmidqoxO
+Gj3cIz211FATr0NvoSZxx9g9Frr7neXYCEfFg7bJXYKZB1CigXqtk1Q3/WBDL9Lz
+HdxAeaJ0cHUtgQXUnWQ93pkgRzvYxBEzn3utnwAmtbx41d2Cty0TfR3KE0CJq1dp
+AgMBAAGjUDBOMB0GA1UdDgQWBBSktczsx8ebU+NG/XG4xqo2AUxr8jAfBgNVHSME
+GDAWgBSktczsx8ebU+NG/XG4xqo2AUxr8jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQCAHoDP50F95ULtK9MRe9HBzj+4zK9XO8wTot6uY4G3gaeFDXUr
+zae5FbUFKnDbTACK/yUFjzPfSRWc5i8S9AdSIPJzQPffDTqOzKLKhhfAtRsHysxe
+MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
+OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
+2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
+vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
+</ns3:X509Certificate></ns3:X509Data></ns3:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="encryption"><ns3:KeyInfo><ns3:X509Data><ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
+MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
+kBBZbZTpzSrVNhvvL6oa4c/vyhYh7Ba67JB35oQ7tjcf4YfLMs2N9YI1OVDX+FO+
+RebZedVNDcUVzqEkLN2rtwRwtniesEMxiRxwEh4CAo8GFy1LeZAc5QtZiJdFNWs5
+tfYTa2WmD++inPf3SymtDjbcB1pAAjLO5lxJoEVXTIZnAiqbvKfQvZpUSmidqoxO
+Gj3cIz211FATr0NvoSZxx9g9Frr7neXYCEfFg7bJXYKZB1CigXqtk1Q3/WBDL9Lz
+HdxAeaJ0cHUtgQXUnWQ93pkgRzvYxBEzn3utnwAmtbx41d2Cty0TfR3KE0CJq1dp
+AgMBAAGjUDBOMB0GA1UdDgQWBBSktczsx8ebU+NG/XG4xqo2AUxr8jAfBgNVHSME
+GDAWgBSktczsx8ebU+NG/XG4xqo2AUxr8jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQCAHoDP50F95ULtK9MRe9HBzj+4zK9XO8wTot6uY4G3gaeFDXUr
+zae5FbUFKnDbTACK/yUFjzPfSRWc5i8S9AdSIPJzQPffDTqOzKLKhhfAtRsHysxe
+MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
+OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
+2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
+vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
+</ns3:X509Certificate></ns3:X509Data></ns3:KeyInfo></ns0:KeyDescriptor><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1" /><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2" /></ns0:SPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">SUNET Play</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">SUNET Play</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>Technical</ns0:GivenName><ns0:EmailAddress>noc@sunet.se</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>noc@sunet.se</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>
diff --git a/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..936b3f3f
--- /dev/null
+++ b/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testgu.pingpong.net/Shibboleth.sso/Metadata">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TEST-GUL, PING PONG vid Göteborgs universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TEST-GUL, PING PONG at Gothenburg university</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test version of GUL, Lärplattformen PING PONG vid Göteborgs universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Test version of GUL, The learning platform PING PONG at Gothenburg university.</mdui:Description>
+        <mdui:Logo height="50" width="168">https://testgu.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://testgu.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
+      </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://testgu.pingpong.net/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testgu.pingpong.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testgu.pingpong.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAME2EogsaBsxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Rlc3RndS5waW5ncG9uZy5uZXQwHhcNMTUwNzMxMDAxNjI1WhcNMjUwNzI4
+MDAxNjI1WjAeMRwwGgYDVQQDExN0ZXN0Z3UucGluZ3BvbmcubmV0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYPbn4CeU3tNI/8FdjRRUJcTb/gG+g0j
+MvE2RPC//eJw/UR0IwFsJy1R7bwEHynfpwMck+0K9nxNUtp84kN//k86Oy2sQVey
+Ai0OCg5smTguBedA2n8lH7RDFkSvwtoASaGLSEoxXrE0nizDf3uWePLOqewzn5+o
+jXWTS4RhnU12mP+fDVcrO8SqGsbOBXh8AGuUkfLOeyOD9Ayc1rNR6+KuObFqs05q
+BKsy+klw3b1OKk5L2eRgcPlZpNzLIfwVPVpanjItgBdZ1crs58oFpKzarVodjDwY
+kozDsyFCczo/YAlovWq5bvGnkap2I3ltuLGN19GIFoABa8XIPhXtbQIDAQABo0Ew
+PzAeBgNVHREEFzAVghN0ZXN0Z3UucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQwKdDx
+5NCyLEP4EiCnI49AdPCJNTANBgkqhkiG9w0BAQUFAAOCAQEAMhDQdkJ+oFVKylVM
+LH9AlRmQlC0uqqaZfPECYwepQ08sAb1f6H3OGS8VfHB0PGrMlSgtu3mJImB3LZ+h
+Du69XL+oQV9qr4XNUYhUXAPXkbiojcUEy2WrJ2kEf3GrNomUm234fLu8WEhDV4iU
+l6EOZqEFS5sUtHpQEkW6ITn7MJH+/g412nbxtNRsVCbaEf8jX6n3qG93xyilOgJ3
+cpCuEjbgpDdWe3DPCrL9Kn4ab88aoblJVmjfH4t6t6TMc+zskhKXiQUGogGxzol3
+MSKIqXKgkSbbCtsduu3LvzmWV1r9U8J1QN7BSz7XBjqHvXgxDQzYMFr1SHtIKmN5
+v3gw1w==
+</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgu.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>