merge

1 files changed, 25 insertions, 56 deletions

diff --git a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
index 3e8d2b56..efed8895 100644
--- a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
+++ b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
@@ -6,26 +6,34 @@
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NTUU KPI SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Service Provider for NTUU KPI</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://sp.kpi.ua</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://sp.kpi.ua/privacy-policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFjDCCBHSgAwIBAgIQJdpkZjptOQA5pnowv0xMuDANBgkqhkiG9w0BAQsFADCB
+MIIFjDCCBHSgAwIBAgIQEUOHKK6sc4pWmFK5HgFIITANBgkqhkiG9w0BAQsFADCB
 kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
 BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNDEyMDcwMDAwMDBaFw0xNTEyMDcyMzU5NTlaMIGZMSEwHwYDVQQLExhE
+QTAeFw0xNTEyMDMwMDAwMDBaFw0xNzAzMDUyMzU5NTlaMIGZMSEwHwYDVQQLExhE
 b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxQjBABgNVBAsTOVByb3ZpZGVkIGJ5IENl
 bnRlciBvZiBVa3JhaW5pYW4gSW50ZXJuZXQgTmFtZXMgKFVLUk5BTUVTKTEcMBoG
 A1UECxMTVWtybmFtZXMgRG9tYWluIFNTTDESMBAGA1UEAxMJc3Aua3BpLnVhMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvDCTRNYQM7vSTaGu1nbVBN9a
-Azcw9xuIhWFQRR3gU4oJEInF/81viGwj3p5Y9e4mtLcUL4dizEE20+HCix/wBhbQ
-m1s9WqPG41sGx1/O5Rr8uGBghHMrINUODIADfovTI5fND8r9ViOzKqKY2fH8i+jL
-EsQISAsg6l43+rHNKikmmA+P7a/WB95QIiYbUjWZEQ8X/LP0TkGCxf4iBjxmVQKA
-L9wQZIn1cFY2tsEGU9//DCUxBwr99XKR2HP+WRM19uR/pTYqa8tGwfzwpBLkYnwU
-i2+WE91TC354idQGdl8wxNf7WC9MRMLQ9tkEnb6z3viEC2bZlG5OiFvP4+n7mQID
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvonPE5+8bja2hn3MFzSwhuAB
+vFZBdpUq7//hvcpNsdHSjNBL5oWTT99bO+E4hIjf5HaSl1T6ZcH2KNl1AWHFKZnO
+pLoi57mX0e8iMYXkOC5SCxSOEURgyBzjDO0bg26NuxWKnTHNjcRqTt3X+aI8qOHa
+EbvokM6E4MmKUErQqBlC85KrNS6Mn6oclRjNP/QYfKk5LE1wQwEa9WEGIMfzXwbz
+IFA61/Shscrq2LOEYAo1L/2Lp6xWPgnPrHXJNN1jj8tvINnslAJ6qTVNPbGWDgni
+zY5rAhcNSJOeWfaKsJdSD4vrcFWhMsf34HI+/EYyn99mjSzU5FtAoEzAcjqFiQID
 AQABo4IB1TCCAdEwHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYD
-VR0OBBYEFNXV2PBr83lrigDkN00nOuovjpIZMA4GA1UdDwEB/wQEAwIFoDAMBgNV
+VR0OBBYEFIMTyzQx9IadYPh9b4ApSthFUYIFMA4GA1UdDwEB/wQEAwIFoDAMBgNV
 HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAE
 SDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJl
 LmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRw
@@ -34,50 +42,12 @@ dXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0
 dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
 ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
 b2NhLmNvbTAjBgNVHREEHDAagglzcC5rcGkudWGCDXd3dy5zcC5rcGkudWEwDQYJ
-KoZIhvcNAQELBQADggEBAB22SGBsT56eFD18+OlzpV5ekVZu3dLFCeXqQs+2laap
-ohp21Jz4ALszsiaXTBw3ncRiPeietPSt5fAcRQhHIlxFLbvlIyul09K94mPxIVWz
-fh3lssluP1PBZQWwfWX4UuOJ9VoRxu7rRMQhPqVEyBisExHRzE4GutKe232yaLOS
-XePBGsw/FmCCGfQUh/qze9M5RTp7cae7jGT7NvKKjQm1Rzp3zjHlJrERrhewwABW
-pZu1QnDsbEyaNXKrlp4NpVX38A9yWwJH9kjrJauIf9zXFsvUFKL3WxfcnvvdTWBQ
-10LU/OxaUIfI2PtYbA2WWTMz5DxjI3qyYd2/MSO0BKc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFjDCCBHSgAwIBAgIQJdpkZjptOQA5pnowv0xMuDANBgkqhkiG9w0BAQsFADCB
-kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNDEyMDcwMDAwMDBaFw0xNTEyMDcyMzU5NTlaMIGZMSEwHwYDVQQLExhE
-b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxQjBABgNVBAsTOVByb3ZpZGVkIGJ5IENl
-bnRlciBvZiBVa3JhaW5pYW4gSW50ZXJuZXQgTmFtZXMgKFVLUk5BTUVTKTEcMBoG
-A1UECxMTVWtybmFtZXMgRG9tYWluIFNTTDESMBAGA1UEAxMJc3Aua3BpLnVhMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvDCTRNYQM7vSTaGu1nbVBN9a
-Azcw9xuIhWFQRR3gU4oJEInF/81viGwj3p5Y9e4mtLcUL4dizEE20+HCix/wBhbQ
-m1s9WqPG41sGx1/O5Rr8uGBghHMrINUODIADfovTI5fND8r9ViOzKqKY2fH8i+jL
-EsQISAsg6l43+rHNKikmmA+P7a/WB95QIiYbUjWZEQ8X/LP0TkGCxf4iBjxmVQKA
-L9wQZIn1cFY2tsEGU9//DCUxBwr99XKR2HP+WRM19uR/pTYqa8tGwfzwpBLkYnwU
-i2+WE91TC354idQGdl8wxNf7WC9MRMLQ9tkEnb6z3viEC2bZlG5OiFvP4+n7mQID
-AQABo4IB1TCCAdEwHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYD
-VR0OBBYEFNXV2PBr83lrigDkN00nOuovjpIZMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAE
-SDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJl
-LmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRw
-Oi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2Vj
-dXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
-ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
-b2NhLmNvbTAjBgNVHREEHDAagglzcC5rcGkudWGCDXd3dy5zcC5rcGkudWEwDQYJ
-KoZIhvcNAQELBQADggEBAB22SGBsT56eFD18+OlzpV5ekVZu3dLFCeXqQs+2laap
-ohp21Jz4ALszsiaXTBw3ncRiPeietPSt5fAcRQhHIlxFLbvlIyul09K94mPxIVWz
-fh3lssluP1PBZQWwfWX4UuOJ9VoRxu7rRMQhPqVEyBisExHRzE4GutKe232yaLOS
-XePBGsw/FmCCGfQUh/qze9M5RTp7cae7jGT7NvKKjQm1Rzp3zjHlJrERrhewwABW
-pZu1QnDsbEyaNXKrlp4NpVX38A9yWwJH9kjrJauIf9zXFsvUFKL3WxfcnvvdTWBQ
-10LU/OxaUIfI2PtYbA2WWTMz5DxjI3qyYd2/MSO0BKc=
+KoZIhvcNAQELBQADggEBAIFHyhglkkb80erci5a4pK6Vgsi2C34WxnUZzcwWmD3G
+m3UJsOkNPDAv3E1bifayu05nZQdLHy1crtgKs0q5FkqhPSBs6iOzr5YObCZOCVl7
+rYyarYeMXdqcPYKuRYXPO3Z8RGoVPYRyUU7gi5lyz+5i1EeSFqEkwVGTV7EzjBtr
+scGwj5R7R1F8+6m+zW6wLnJqIIYUZ8UpxtF7n/Mtza8bdJQJ+39JeHX+ZErdYh3e
+2a7XcvfmOg9UBEhd/UhzCegDplloCmxzt2dmmlFEPj/IA5wJCtc0nUmeirxhYoZx
+5GHTzCwt0Z2osUZDlKP/lZr+nSBukUtRYtyoNNJoUJ0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -88,9 +58,8 @@ pZu1QnDsbEyaNXKrlp4NpVX38A9yWwJH9kjrJauIf9zXFsvUFKL3WxfcnvvdTWBQ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp/artifact" index="3"/>
     <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="ru">НТУУ "КПИ"</md:ServiceName>
-      <md:ServiceName xml:lang="uk">НТУУ "КПІ"</md:ServiceName>
-      <md:ServiceName xml:lang="en">NTUU "KPI"</md:ServiceName>
+      <md:ServiceName xml:lang="en">NTUU KPI SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Service Provider for NTUU KPI</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" 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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>