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

1 files changed, 40 insertions, 91 deletions

diff --git a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
index 67a9ca2d..bb7a8d61 100644
--- a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.geant.org/adfs/services/trust">
-  <!--
-		This is a "GÉANT Web Presence" ADFS SP for GÉANT Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.geant.org/adfs/services/trust">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-08T14:43:52Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
@@ -12,64 +9,16 @@
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" 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="en">GÉANT Web Presence</mdui:DisplayName>
         <mdui:Description xml:lang="en">Suite of websites and web applications for GÉANT Project.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://adfs.geant.org/PrivacyPolicy/GEANTWebPrivacyPolicy.htm</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3jCCAcagAwIBAgIQNCvbUYl4+6RA9jwSRvProjANBgkqhkiG9w0BAQsFADAr
-						MSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBhZGZzLmdlYW50Lm9yZzAeFw0x
-						NTAxMDUxNzI1MThaFw0xNjAxMDUxNzI1MThaMCsxKTAnBgNVBAMTIEFERlMgRW5j
-						cnlwdGlvbiAtIGFkZnMuZ2VhbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA30IY2MRgrSkAm+PyHBlPTQpGTseZO3LHJt1NRUYQrPT2gWW8HEHu
-						U6QsmRhIAcKZd62Uf8zFnFiBuVi7Z8R4DrfQBSp7thb0ecC6w4FHNEvQiUyyPwOP
-						0TSjtL2vKA1qL4REVOTJbjNRWnJuvxURQGSwP7bKT/4Q9qoi0XcNdCPNF70SSToZ
-						6dF72b42f5GaFyfbxyGPuBS1VgPqJ/NpeTaxZ+UReYHvpVPg38LzKL7x3eWbYD4B
-						2x8prA516mb4DS48pAC1/LAkNvAckIdJWYahG5RAukvYSOjh97xKJ0RdhsWERda4
-						JGcncH47u7/rI1ow3yCU7vXI8tM2zHqSfQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-						AQBbaHR5M/Nhl8XqsVzUWhsduIcajWGyUPuNqFqJ5kv+/lxd9GWxdDiy4XoaXqNR
-						PgUB3lm5CkLHZ0Xy8uGU1HtQEF+Ah4isruZX0RKOBWoM9iO9Gwl1arKfeEwUj16K
-						VzM+2z5CSIeWZUu6NAGiwKcDdd7Rce2+GhYvrdeSYpDA+NH0qFFnFo74ZdOCjNQO
-						pMLuTFae/RclQ2dPLq1yIVrqage2PE8akRx1Cb8hLkN1rOeAuGFC3JF2CgVk3A7n
-						BJHpWh6OHmU5BbvqkdGVyOn4dh725m13y28sBMWtbxetuKg8+4ABRVT4d3Yoo4Lp
-						ZqgR2NgRxpThAP74Xt3nJL9c
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC2DCCAcCgAwIBAgIQHEekTp8+u7dHPjnacxhaKTANBgkqhkiG9w0BAQsFADAo
-						MSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBhZGZzLmdlYW50Lm9yZzAeFw0xNTAx
-						MDUxNzI1MTdaFw0xNjAxMDUxNzI1MTdaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmlu
-						ZyAtIGFkZnMuZ2VhbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAyabL1Th/fRkPS/7ypS2iSRe3FvnLKV38idwvfNX/KB7DpSYpF/Xb0aMmn5Y6
-						H83FMhHo+Jy954JTneFSgeETb9K/nakOKO6EmwPJrTuQ2C533aU5ulguyrI/hzzd
-						KoHBke+UcPEKYEBvGjQwQcqcKtzed61ZUjBxBWhm2UAakXZs8QqHSA9E0a46mRbO
-						Dd0qgPwJ+vB81iNFnNo7zKkKu/L29ISmV/lv8NXrQIimAZCbSUd1Mux2pK1UoGJw
-						IjkyLZNQknKuaia+Hg1DdEtiXQdomoedFNCTbIyiBdCcKit4fw/mfIVn0nDj0NZe
-						39z9L0VLnzfouS4tJpL7ftPa+QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBgy6rX
-						5kOhESj8LQB8iphzbKYfOYCf9f0yjPXpYT2YOM/qQVO6F+W/zt+OrEact0rCgR8a
-						/XzJoyP96nfFcqajDRoYdodSn0d+k+BSPZur1V8MHa2J/sRWSVhrzmUdkT5HkQ9O
-						WJSmyuwzB/2IXOUL2Cx0PsWXYINRk3zDDDlQ6o6tWQTQm2S/RNWJ3BUk1IWuFqit
-						Xdb7PE/rG+xYgvoMi81wQHHCZfbuljr1Fl5eaoV09oMIKezaT646Wk10pRwVS51O
-						zvoED8r9o9M5S2Ii+IVBO+Cj1ZRcn+HhBvPyu091w5ApZKr2+hnf4HOfiu58+Yj+
-						qUUDFVgtu+n/JlJy
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -93,37 +42,37 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.geant.org/adfs/ls/" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT Web Presence</ServiceName>
-      <ServiceDescription xml:lang="en">
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.geant.org/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT Web Presence</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				Suite of websites and web applications for GÉANT Project.
-			</ServiceDescription>
-      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Ltd.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT Ltd. Support</GivenName>
-    <EmailAddress>mailto:itsupport@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT Ltd. IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+			</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT Ltd. Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT Ltd. IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>