1 files changed, 77 insertions, 62 deletions
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
index 6650ca1d..149e3079 100644
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
@@ -16,49 +16,67 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irnet.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Athena - Research and Innovation Center</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.athena-innovation.gr/en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.athena-innovation.gr/el.html</mdui:InformationURL>
+        <mdui:Logo height="90" width="73">https://login.athena-innovation.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>athena-innovation.gr</mdui:DomainHint>
+        <mdui:DomainHint>imis.athena-innovation.gr</mdui:DomainHint>
+        <mdui:DomainHint>ilsp.gr</mdui:DomainHint>
+        <mdui:DomainHint>ceti.gr</mdui:DomainHint>
+        <mdui:DomainHint>isi.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.63.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.3.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.58.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.192.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.217.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2600::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.0365046,23.802512</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIFMzCCBBugAwIBAgIJAO+fpaSnfQp8MA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
-                            VQQGEwJHUjEfMB0GA1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UE
-                            CxMzSW5zdGl0dXRlIGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBT
-                            eXN0ZW1zMSMwIQYDVQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwG
-                            CSqGSIb3DQEJARYfc3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjAeFw0x
-                            MDA3MTYwOTI3MTRaFw0xMzA3MTUwOTI3MTRaMIHBMQswCQYDVQQGEwJHUjEfMB0G
-                            A1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UECxMzSW5zdGl0dXRl
-                            IGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zMSMwIQYD
-                            VQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwGCSqGSIb3DQEJARYf
-                            c3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBALFNUKx/dLKM8PwuRA0l1kswzIE2v4HcFOVbFPEKSFEA
-                            dCT0IHit5S0I6y2SCFnOm3taZlstp5OkvCsf/l0oHQ4lSW7mrMQs4SZN4cZWYgz6
-                            U5I7Vht3r0541sZwp7POJ43aQPShsZrgexXZn+2FH6OX84NxcGScDqL5tC/xXUfw
-                            uG7p50sZPZnQDEKK+eEZHVasYaYHBCthbXj9t8t8Ok02iR/54EM8mIJXmUzJniw1
-                            St+YdEIg0fHy7c8cMBe94bN3vmMqeF++bQi79tYKt7p+keVOUVl5JdWjzoCuS4qs
-                            n5Vnepp+kslANUsi0uX4qGZp0d0Ynh0W84ll4qzhHgMCAwEAAaOCASowggEmMB0G
-                            A1UdDgQWBBSWc+gN1j3YOAuAptSS913uHOWWPTCB9gYDVR0jBIHuMIHrgBSWc+gN
-                            1j3YOAuAptSS913uHOWWPaGBx6SBxDCBwTELMAkGA1UEBhMCR1IxHzAdBgNVBAoT
-                            FlJlc2VhcmNoIENlbnRlciBBVEhFTkExPDA6BgNVBAsTM0luc3RpdHV0ZSBmb3Ig
-                            dGhlIE1hbmFnZW1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtczEjMCEGA1UEAxMa
-                            bG9naW4uYXRoZW5hLWlubm92YXRpb24uZ3IxLjAsBgkqhkiG9w0BCQEWH3N0YWZm
-                            QGltaXMuYXRoZW5hLWlubm92YXRpb24uZ3KCCQDvn6Wkp30KfDAMBgNVHRMEBTAD
-                            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQANR7VK2yxrJDkDWZKY2bfJkUNhPmNCFLjR
-                            kg24Uyi4DVHu9I8bT11mK0Cbk2t4GClOAJ6jVVUBcY3jQnWSpgFj7U20ojb759Te
-                            Nz3HIThvoosZyy4oApCcN4YcM1saiOMOYYQ7Ahu98Q54Sur2o4ltwgWoTvWZoIHe
-                            Y//gCd0L1J81+W8XcMKwfvn0Jn9pXeQ3tSvnSS4C3tep0JnZTeUaxDsilpU7GKmr
-                            8d2yiuD/jwzp2LtzzsOWB0mxNDvIHKv3/KCDlt/LHgSadNcLy75dEaxOHh3kOUc3
-                            mHIwZ8ky29JeOx3BkarQuyq9Y0mzqb0GNqTKp9jBbGaZjEZk9cWj
+                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
+                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
+                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
+                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
+                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
+                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
+                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
+                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
+                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
+                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
+                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
+                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
+                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
+                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
+                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
+                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
+                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</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>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -70,49 +88,46 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irnet.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIFMzCCBBugAwIBAgIJAO+fpaSnfQp8MA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
-                            VQQGEwJHUjEfMB0GA1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UE
-                            CxMzSW5zdGl0dXRlIGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBT
-                            eXN0ZW1zMSMwIQYDVQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwG
-                            CSqGSIb3DQEJARYfc3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjAeFw0x
-                            MDA3MTYwOTI3MTRaFw0xMzA3MTUwOTI3MTRaMIHBMQswCQYDVQQGEwJHUjEfMB0G
-                            A1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UECxMzSW5zdGl0dXRl
-                            IGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zMSMwIQYD
-                            VQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwGCSqGSIb3DQEJARYf
-                            c3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBALFNUKx/dLKM8PwuRA0l1kswzIE2v4HcFOVbFPEKSFEA
-                            dCT0IHit5S0I6y2SCFnOm3taZlstp5OkvCsf/l0oHQ4lSW7mrMQs4SZN4cZWYgz6
-                            U5I7Vht3r0541sZwp7POJ43aQPShsZrgexXZn+2FH6OX84NxcGScDqL5tC/xXUfw
-                            uG7p50sZPZnQDEKK+eEZHVasYaYHBCthbXj9t8t8Ok02iR/54EM8mIJXmUzJniw1
-                            St+YdEIg0fHy7c8cMBe94bN3vmMqeF++bQi79tYKt7p+keVOUVl5JdWjzoCuS4qs
-                            n5Vnepp+kslANUsi0uX4qGZp0d0Ynh0W84ll4qzhHgMCAwEAAaOCASowggEmMB0G
-                            A1UdDgQWBBSWc+gN1j3YOAuAptSS913uHOWWPTCB9gYDVR0jBIHuMIHrgBSWc+gN
-                            1j3YOAuAptSS913uHOWWPaGBx6SBxDCBwTELMAkGA1UEBhMCR1IxHzAdBgNVBAoT
-                            FlJlc2VhcmNoIENlbnRlciBBVEhFTkExPDA6BgNVBAsTM0luc3RpdHV0ZSBmb3Ig
-                            dGhlIE1hbmFnZW1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtczEjMCEGA1UEAxMa
-                            bG9naW4uYXRoZW5hLWlubm92YXRpb24uZ3IxLjAsBgkqhkiG9w0BCQEWH3N0YWZm
-                            QGltaXMuYXRoZW5hLWlubm92YXRpb24uZ3KCCQDvn6Wkp30KfDAMBgNVHRMEBTAD
-                            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQANR7VK2yxrJDkDWZKY2bfJkUNhPmNCFLjR
-                            kg24Uyi4DVHu9I8bT11mK0Cbk2t4GClOAJ6jVVUBcY3jQnWSpgFj7U20ojb759Te
-                            Nz3HIThvoosZyy4oApCcN4YcM1saiOMOYYQ7Ahu98Q54Sur2o4ltwgWoTvWZoIHe
-                            Y//gCd0L1J81+W8XcMKwfvn0Jn9pXeQ3tSvnSS4C3tep0JnZTeUaxDsilpU7GKmr
-                            8d2yiuD/jwzp2LtzzsOWB0mxNDvIHKv3/KCDlt/LHgSadNcLy75dEaxOHh3kOUc3
-                            mHIwZ8ky29JeOx3BkarQuyq9Y0mzqb0GNqTKp9jBbGaZjEZk9cWj
+                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
+                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
+                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
+                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
+                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
+                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
+                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
+                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
+                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
+                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
+                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
+                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
+                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
+                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
+                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
+                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
+                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</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>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</OrganizationName>