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

1 files changed, 61 insertions, 43 deletions

diff --git a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
index be32d6f2..086277ff 100644
--- a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
@@ -1,60 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niif.hu/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexaa</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>193.6.222.0/24</mdui:IPHint>
         <mdui:IPHint>193.6.223.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
       </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:DisplayName>
         <mdui:Description xml:lang="hu">NIIF Intézet</mdui:Description>
         <mdui:Description xml:lang="en">NIIF Institute</mdui:Description>
         <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.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>MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVaFw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGmJ/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAEbQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSiuov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17egIqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uKAd98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG14Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlYMB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulksHUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbKZp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6NtocI7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDycAuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14tty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=</ds:X509Certificate>
+          <ds:X509Certificate>
+MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
+VQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3Qx
+DjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlm
+Lmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVa
+Fw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1T
+dGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQL
+DANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlA
+bmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGm
+J/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAE
+bQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSi
+uov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17eg
+IqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uK
+Ad98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG1
+4Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlY
+MB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulks
+HUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbK
+Zp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6Ntoc
+I7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDyc
+AuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14t
+ty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=
+                                            </ds:X509Certificate>
         </ds:X509Data>
         <ds:KeyName>idp.niif.hu</ds:KeyName>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">NIIF Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>