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

1 files changed, 60 insertions, 34 deletions

diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
index 9e60f204..75e2ba51 100644
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
+++ b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
+  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
     <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
       <mdrpi:RegistrationPolicy xml:lang="en">
                     http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
@@ -10,16 +10,22 @@
                 </mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </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>
+  <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="en">~okeanos global</mdui:DisplayName>
+        <mdui:Description xml:lang="en">~okeanos global GRNET cloud services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://okeanos-global.grnet.gr/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://accounts.okeanos-global.grnet.gr/ui/approval_terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://accounts.okeanos-global.grnet.gr/ui/approval_terms#grterm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="250" xml:lang="en">https://okeanos-global.grnet.gr/static/medialibrary/2013/10/dashboard_logo.png</mdui:Logo>
+      </mdui:UIInfo>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
-        <ds:KeyName>w0.accounts.okeanos-global.grnet.gr</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=w0.accounts.okeanos-global.grnet.gr,OU=Domain Control Validated</ds:X509SubjectName>
           <ds:X509Certificate>
                             MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -50,13 +56,11 @@
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
-        <ds:KeyName>w0.accounts.okeanos-global.grnet.gr</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=w0.accounts.okeanos-global.grnet.gr,OU=Domain Control Validated</ds:X509SubjectName>
           <ds:X509Certificate>
                             MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -87,24 +91,45 @@
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="0" isDefault="true">
+      <ServiceName xml:lang="en">~okeanos global</ServiceName>
+      <ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</ServiceDescription>
+      <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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
     <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
     <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
@@ -112,13 +137,14 @@
     <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
     <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
   </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  <ContactPerson contactType="technical">
     <Company>Greek Research and Technology Network</Company>
-    <EmailAddress>support@okeanos.grnet.gr</EmailAddress>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
     <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-210-9569181</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  <ContactPerson contactType="support">
     <GivenName>~okeanos support</GivenName>
     <EmailAddress>support@okeanos.grnet.gr</EmailAddress>
   </ContactPerson>
-</md:EntityDescriptor>
+</EntityDescriptor>