http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 63 insertions, 77 deletions

diff --git a/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml b/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
index 3d98a3dc..cfd1b132 100644
--- a/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.demo.researchspace.com/shibboleth">
-  <!--
-		This is a "RSpace ELN Demo" Shibboleth SP for Research Innovations Ltd.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.demo.researchspace.com/shibboleth">
+  <md:Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -23,86 +20,75 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-27T09:25:01Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <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.researchspace.com/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.researchspace.com/Shibboleth.sso/Login" index="1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.researchspace.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.researchspace.com/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">RSpace ELN Demo</mdui:DisplayName>
         <mdui:Description xml:lang="en">RSpace is an enterprise grade Electronic Lab Notebook designed for use in research universities</mdui:Description>
         <mdui:Logo height="158" width="246">https://demo.researchspace.com/images/biggerLogo.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIFNDCCBBygAwIBAgIJAOlblj2qNs+GMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
-						VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
-						MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
-						cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2Vj
-						dXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTE1MDIyMzE3MTc0MFoX
-						DTE2MDIyODIxMTYwNlowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRh
-						dGVkMRwwGgYDVQQDDBMqLnJlc2VhcmNoc3BhY2UuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEApywBjQ4XbItRNEMsNBPUQ1fAmt8SdduHZxAHu2K2
-						nJ59a8Hanjm/6nZRwTpTGx8LOPi7HTxd3GPvqKn1LDDRAqCm80TK7Em6uPEoxEz9
-						tG1DnAdLadQkwQZToMWLEfgLaP0wZApaPLwoKSo40STvr+Lge5GjWWov3+suAJzK
-						UvkcdvIN6fQGMn2lKluaUxnz8zLceqKn9ZcTwFB/lZIrhgy44et7NeSAtzYT/UFp
-						2a0Bb0mZ6A3bBoa9TieExIM2T0y4XjfxOFMyDgWUHdCfQmN8e2GCRgLJxhX5RvgT
-						4V68YTP2hmjRXtShvuqLaEJ2K/cuM05UPDvSHVjVN+VdjQIDAQABo4IBuTCCAbUw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYD
-						VR0PAQH/BAQDAgWgMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ29kYWRk
-						eS5jb20vZ2RpZzJzMS04Ny5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5
-						MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3Jl
-						cG9zaXRvcnkvMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29j
-						c3AuZ29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVz
-						LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDC
-						vSeOzDSDMKIz1/tss/C0LIDOMDEGA1UdEQQqMCiCEyoucmVzZWFyY2hzcGFjZS5j
-						b22CEXJlc2VhcmNoc3BhY2UuY29tMB0GA1UdDgQWBBRi191FYODUhC1Vbl7Lo4A/
-						S2IBLDANBgkqhkiG9w0BAQsFAAOCAQEAhgLk8qgHkDoMiyfNmndVeg6Va3eMq21b
-						aIA62U3oPkThGyUMGSOxafK9Q32cV+f5Rlf77JAUtlhGZUR7VoLohchWlriFqADU
-						okylabWwZlNicPdR87STKGjdULrgwkeljH2QCVUYIlY3Eh/PSxu2SLKQbzknmu6v
-						SaJlfnQJfp5J5AGRSCDz5qof+zjcr1Nw8vsFoXJsoIFVIQhDWL8k0zWTUUDCYj4X
-						L5jGOPnBbwfTaQ9FmdivTSmZUjgNPRwu2pdrmTbEd/6GH1tSggafwK9+Q3G52Vpl
-						jmABGwcK92rCOutMyEU1Of9qHytoGzuSBM3bRmMWDYLPU7n2mczz1w==
+						MIIDITCCAgmgAwIBAgIJANwZ+u5yyYcuMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHmlwLTEwLTE4My0yMDQtMTEyLmVjMi5pbnRlcm5hbDAeFw0xNjAxMjgxMzI5
+						MTFaFw0yNjAxMjUxMzI5MTFaMCkxJzAlBgNVBAMTHmlwLTEwLTE4My0yMDQtMTEy
+						LmVjMi5pbnRlcm5hbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+R
+						QrD+/rGvxp/lV23XELO+46UXlpF21JN2QzYCulmK/OdWIveXSMVX5GyJr2qNOLQ+
+						WaJiY/22IYBT6y+JBNSG0Y1035Dt9NWvZiZwhpaRQLvolrVQ54NtNzEI3OW+fEyO
+						Zi+jpCRLjMjRbym5pbQI0In5ObPSO9yMu8PeUAvAOTQiF07yH/+V1CKIyHzW9KwT
+						9hBzUr4oLqTcHIGQt2k7TiQojAUUx+r6UjE5zFha9IBO+w0RBvzfIjhLCcJ1NbJe
+						6H30hCTA6o4VFfP4EIDnDi39TDj8uZwa6WpZB/unSfWJDrIoio7Nv+V+ri3Q69Rc
+						9OuHqKyVq0G0sBMWKTkCAwEAAaNMMEowKQYDVR0RBCIwIIIeaXAtMTAtMTgzLTIw
+						NC0xMTIuZWMyLmludGVybmFsMB0GA1UdDgQWBBQXYjoNhygtiSsX3YWZ4gjruh5Y
+						+DANBgkqhkiG9w0BAQUFAAOCAQEAnQeRbKocV6Kle4vZnYGTlLc83FbjyHJx9CvB
+						dDunWGEs9pX2P5F8j2jOr+U0n/UsABXlIWRDWvtUb8uE6uByDJ+C2gIUCPSiUQmc
+						oOEUZSdnw0896U9U+u8Z7rb0p1ymcSb8nHMKDFRmerAc42HMAdXXHk2x11z9jDFT
+						TQA2PGw8r3gVx7CYNYH6cpPcnpqw+oJdq9aJZuPPiiQxLsKcfZRdP0QWVB7OFeov
+						cmZfEyO7pK5jDrtmAk9LcGMBQ/rDcI0oMgTdDPfmdI2vlIx+ubcdE26jzllYOWUF
+						gxcqTxdxZ1uOBFCZBpakANq368HS3vm1rFISGY2Vup0tTCkolw==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Research Innovations Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RSpace ELN Demo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.researchspace.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Research Support</GivenName>
-    <EmailAddress>mailto:support@researchspace.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Kowalski</SurName>
-    <EmailAddress>mailto:matthias@researchspace.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+      <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.researchspace.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Research Innovations Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSpace ELN Demo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.researchspace.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Research Support</md:GivenName>
+    <md:EmailAddress>mailto:support@researchspace.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthias</md:GivenName>
+    <md:SurName>Kowalski</md:SurName>
+    <md:EmailAddress>mailto:matthias@researchspace.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>