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

1 files changed, 74 insertions, 52 deletions

diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
index 34d74f75..79b8b0a5 100644
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -1,62 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vvc.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-edugain</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2010-02-03T00:00:00Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vvc.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2010-02-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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="hu">NIIF kollaborációs portál</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NIIF Voice Video Collaboration Service</mdui:DisplayName>
         <mdui:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
         <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>vvc.niif.hu</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
+BAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2
+Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkG
+A1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxML
+dnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+
+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUV
+fCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oE
+GdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoP
+kWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57
+NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx
+7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3Bc
+A1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQsw
+CQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQD
+Ewt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWT
+YyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETT
+flNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwur
+PYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQr
+sX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQ
+sdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=
+					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <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://vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">NIIF kollaborációs portál</ServiceName>
-      <ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</ServiceName>
-      <ServiceDescription xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn </ServiceDescription>
-      <ServiceDescription xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</ServiceDescription>
-      <RequestedAttribute FriendlyName="mail" 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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eppn" 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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="affiliation" 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="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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 - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</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>Video Admin</SurName>
-    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Video Admin</SurName>
-    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST"/>
+    <md:AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
+      <md:ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+      <md:RequestedAttribute 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" FriendlyName="eppn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute 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" FriendlyName="affiliation" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <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 - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</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>Video Admin</md:SurName>
+    <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Video Admin</md:SurName>
+    <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>