From 9aa6a22c73433380295d23529d29286deef9e6fa Mon Sep 17 00:00:00 2001 From: Michal Jankowski Date: Tue, 10 Nov 2026 10:18:34 +0100 Subject: [PATCH] PXC-5333: ALTER INSTANCE RELOAD TLS for Galera https://perconadev.atlassian.net/browse/PXC-5333 Problem: ALTER INSTANCE RELOAD TLS reloads only the MySQL TLS context. Galera TLS has to be reloaded separately with SET GLOBAL wsrep_provider_options='socket.ssl_reload=1', even when pxc_encrypt_cluster_traffic=ON and Galera uses the MySQL ssl_* files. Resolution: Treat Galera connections as TLS channels, without changing the parser: * FOR CHANNEL wsrep reloads Galera TLS only, with the same locking as socket.ssl_reload. It fails if no provider is loaded, and succeeds with a warning if Galera TLS is disabled (socket.ssl=NO). * FOR CHANNEL mysql_main_and_wsrep reloads mysql_main, then wsrep. If the wsrep part fails, the error says that mysql_main has already been reloaded. NO ROLLBACK ON ERROR applies to the MySQL part only. * With pxc_encrypt_cluster_traffic=ON and a provider configured, plain ALTER INSTANCE RELOAD TLS and FOR CHANNEL mysql_main behave like mysql_main_and_wsrep. * With pxc_encrypt_cluster_traffic=ON, Galera keeps the socket.ssl_* paths set at provider load and only re-reads those files. If ssl_ca, ssl_cert or ssl_key now point elsewhere, a warning is pushed and written to the error log saying a restart is needed. The statement is local to the node (no TOI) and affects new connections only. Like socket.ssl_reload, the Galera reload replaces the certificate and key but only adds to the CA trust store: a CA removed from the socket.ssl_ca file stays trusted until restart. Test: galera.galera_ssl_reload_tls rotates node 1 to a certificate issued by a new, unrelated CA (galera-reload-*.pem in std_data) and restarts node 2 trusting only that CA. Node 2 can rejoin only if node 1 presents the reloaded certificate, so the test fails if the reload is not applied. Co-Authored-By: Claude Opus 5.5 --- .../std_data/galera-reload-ca-bundle.pem | 47 +++++ mysql-test/std_data/galera-reload-ca-cert.pem | 21 ++ .../std_data/galera-reload-server-cert.pem | 22 +++ .../std_data/galera-reload-server-key.pem | 28 +++ .../galera/r/galera_ssl_reload_tls.result | 44 +++++ .../r/galera_ssl_reload_tls_encrypt.result | 53 +++++ .../r/galera_ssl_reload_tls_no_ssl.result | 21 ++ .../suite/galera/t/galera_ssl_reload_tls.cnf | 7 + .../suite/galera/t/galera_ssl_reload_tls.test | 176 +++++++++++++++++ .../t/galera_ssl_reload_tls_encrypt.cnf | 4 + .../t/galera_ssl_reload_tls_encrypt.test | 168 ++++++++++++++++ .../t/galera_ssl_reload_tls_no_ssl.test | 32 +++ sql/sql_admin.cc | 185 ++++++++++++++---- sql/wsrep_var.cc | 81 ++++++++ sql/wsrep_var.h | 20 ++ 15 files changed, 875 insertions(+), 34 deletions(-) create mode 100644 mysql-test/std_data/galera-reload-ca-bundle.pem create mode 100644 mysql-test/std_data/galera-reload-ca-cert.pem create mode 100644 mysql-test/std_data/galera-reload-server-cert.pem create mode 100644 mysql-test/std_data/galera-reload-server-key.pem create mode 100644 mysql-test/suite/galera/r/galera_ssl_reload_tls.result create mode 100644 mysql-test/suite/galera/r/galera_ssl_reload_tls_encrypt.result create mode 100644 mysql-test/suite/galera/r/galera_ssl_reload_tls_no_ssl.result create mode 100644 mysql-test/suite/galera/t/galera_ssl_reload_tls.cnf create mode 100644 mysql-test/suite/galera/t/galera_ssl_reload_tls.test create mode 100644 mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.cnf create mode 100644 mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.test create mode 100644 mysql-test/suite/galera/t/galera_ssl_reload_tls_no_ssl.test diff --git a/mysql-test/std_data/galera-reload-ca-bundle.pem b/mysql-test/std_data/galera-reload-ca-bundle.pem new file mode 100644 index 00000000000..356334bd3a5 --- /dev/null +++ b/mysql-test/std_data/galera-reload-ca-bundle.pem @@ -0,0 +1,47 @@ +-----BEGIN CERTIFICATE----- +MIIDWTCCAkGgAwIBAgIJAIlW4JmZGnU4MA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNV +BAYTAkZJMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg +Q29tcGFueSBMdGQwIBcNMTQxMDI0MDc1MTU1WhgPMzAxNDAyMjQwNzUxNTVaMEIx +CzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl +ZmF1bHQgQ29tcGFueSBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDDzU6xLZDD5rZENsOpTpTmqS8YisBaefU3ZeN7VJepZZ/7unM/1YLGJtuRh2Qa +MyTkvyjzf7bSFsDt9L5lfQwBBblVeWkrCvGnQmHDQQYB7JrSmFDPz9W9Mxf9Q2BW +B3lcoKXXJgMnWw0WGrt0lEdFp9gWbq8H9hwJdjpyyk4ZTIuucSOD4JUP3QFEhYU5 +kdcIbDRVw81J4eAZ6EdvbjDN05S7qWjW7rJTnCHAHEd18hcsMGwjpwhjEaSdhMrM +mhOeL8kuQV0fI8v2xfYBliIn9xBZGOVzySPzwFmQceORlW6F3V5w6mwFkmuXqXWX +Qo98swTu7mb89qVYmR71d3L3AgMBAAGjUDBOMB0GA1UdDgQWBBRdWet/kGNTyvXK +wuBdP/eSldOgWjAfBgNVHSMEGDAWgBRdWet/kGNTyvXKwuBdP/eSldOgWjAMBgNV +HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCcJpP+DR4AJxVelNTSZa+V38c+ +jgrMD2Ku2eU8NQlsjgMfNEU5Md/g7FpP8aCFzVf0kAAT7DxZmSE3uWXQbMXyVJmy +bF+qXinf71QzdWULm6sASoshC6wbHnXL9ZjWQ3gh1nqVgo3MmLQYrb3eJfKaaLoc +wpjhYxVxGFOx1ITN3jED64lUfoLHvR6NFbESYKAuAAzSNqX4HOQ3uGk2THM8JocZ +oH2+38d81Kd4HQ7DDDKS/isG0+rR60Ti1cMgu7OT7p1dZCwT/KQuI5eGjE9lubkc +yAJjaod4rVLdBri3XVvtySfS2+/75qUgv2TF7d/s7mxMq4DDt29yeKSUhZCs +-----END CERTIFICATE----- +-----BEGIN DH PARAMETERS----- +MIGHAoGBAJWyvKjE+s7OP4Lj1jXKGlJGWT4Vd5YaxPljihTsRe1aXkWAgsuwISXk +/TQ8Rx5Zmze7rtwtU0PoYxvuam9FMXYqhw2dVe4qRdeSX78DSiL/YBkQzaxlfWVy +RE9+9dzHbCtRVDlN7K1kA+mGWH4/r7NAu4Qm/003V0NTtMwQSqebAgEC +-----END DH PARAMETERS----- + +-----BEGIN CERTIFICATE----- +MIIDcTCCAlmgAwIBAgIUfuxHCXbpE4LL2OS9qJRIo/oOFUwwDQYJKoZIhvcNAQEL +BQAwPzELMAkGA1UEBhMCVVMxEDAOBgNVBAoMB1BlcmNvbmExHjAcBgNVBAMMFUdh +bGVyYSBSZWxvYWQgVGVzdCBDQTAgFw0yNjExMTIxNDQxNTJaGA8yMTI2MTAxOTE0 +NDE1MlowPzELMAkGA1UEBhMCVVMxEDAOBgNVBAoMB1BlcmNvbmExHjAcBgNVBAMM +FUdhbGVyYSBSZWxvYWQgVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBANN7Db0gGrlYDGQNfXO6pRR7/30GNeEgOSaCmL7sU3JFmsRPsLgEOdcH +jR77bBaTHKRmBPruDa+3TDK3aeK6KpFKaZY+xrMnFnq7p8dpKsAsIKsJdZw9igZ+ +dRx8/MfIOlI10LARAIgATSZPQ306jasQh5y/Rif1IHsJd17o7Dda0BwhyEICmst7 +GxZzrAhKlf48oNBC3BVjghV38vdjso1dQHChftWn+Yii5GgeZYlHguuqg/rIGKGj +ONo8io3irbg0pOSLlZwhFELaKTvwGYW6N9SNllpckt4kRC+rYt8ILMZQMJ+aIyys +MD+WFTBDQQuo2NwYoO8/EemeaBoSjVsCAwEAAaNjMGEwHQYDVR0OBBYEFI3zvLA2 +Y6FwHICh7MpfNd4G0dw8MB8GA1UdIwQYMBaAFI3zvLA2Y6FwHICh7MpfNd4G0dw8 +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUA +A4IBAQAJlwobGsKRS1Dyy9XRksx7EM8Y3iASRgqoVZAZz7cjta1xcMhFkAwBLxIB +QbqcLEeuXxstbMXZ46v85tSjXxKZGk17dZ03vmwh4NtQwDSv7G/kmEawW1sT5bYe +Sv/OCzBaJhiLFqTZE4UzVENMUc8ixhWIhQz6fn4I+++cTUWpxWbYn8RicarL4vX7 +SJS9gjjrEFv1r6qjAIX8UW+s3LC+d16P4fbyrhgDgi5TeN7kPQkC0+eavcbPqdu1 +W6jzERPRMErWXxoEYs0G7f0d6ORfFXM2o0uPxBhkSfpPlPWk0xAHai/jUiNIjONl +FHlHOu+OvORx8sR8Bj2aacPygSbY +-----END CERTIFICATE----- diff --git a/mysql-test/std_data/galera-reload-ca-cert.pem b/mysql-test/std_data/galera-reload-ca-cert.pem new file mode 100644 index 00000000000..635b7d87568 --- /dev/null +++ b/mysql-test/std_data/galera-reload-ca-cert.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDcTCCAlmgAwIBAgIUfuxHCXbpE4LL2OS9qJRIo/oOFUwwDQYJKoZIhvcNAQEL +BQAwPzELMAkGA1UEBhMCVVMxEDAOBgNVBAoMB1BlcmNvbmExHjAcBgNVBAMMFUdh +bGVyYSBSZWxvYWQgVGVzdCBDQTAgFw0yNjExMTIxNDQxNTJaGA8yMTI2MTAxOTE0 +NDE1MlowPzELMAkGA1UEBhMCVVMxEDAOBgNVBAoMB1BlcmNvbmExHjAcBgNVBAMM +FUdhbGVyYSBSZWxvYWQgVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBANN7Db0gGrlYDGQNfXO6pRR7/30GNeEgOSaCmL7sU3JFmsRPsLgEOdcH +jR77bBaTHKRmBPruDa+3TDK3aeK6KpFKaZY+xrMnFnq7p8dpKsAsIKsJdZw9igZ+ +dRx8/MfIOlI10LARAIgATSZPQ306jasQh5y/Rif1IHsJd17o7Dda0BwhyEICmst7 +GxZzrAhKlf48oNBC3BVjghV38vdjso1dQHChftWn+Yii5GgeZYlHguuqg/rIGKGj +ONo8io3irbg0pOSLlZwhFELaKTvwGYW6N9SNllpckt4kRC+rYt8ILMZQMJ+aIyys +MD+WFTBDQQuo2NwYoO8/EemeaBoSjVsCAwEAAaNjMGEwHQYDVR0OBBYEFI3zvLA2 +Y6FwHICh7MpfNd4G0dw8MB8GA1UdIwQYMBaAFI3zvLA2Y6FwHICh7MpfNd4G0dw8 +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUA +A4IBAQAJlwobGsKRS1Dyy9XRksx7EM8Y3iASRgqoVZAZz7cjta1xcMhFkAwBLxIB +QbqcLEeuXxstbMXZ46v85tSjXxKZGk17dZ03vmwh4NtQwDSv7G/kmEawW1sT5bYe +Sv/OCzBaJhiLFqTZE4UzVENMUc8ixhWIhQz6fn4I+++cTUWpxWbYn8RicarL4vX7 +SJS9gjjrEFv1r6qjAIX8UW+s3LC+d16P4fbyrhgDgi5TeN7kPQkC0+eavcbPqdu1 +W6jzERPRMErWXxoEYs0G7f0d6ORfFXM2o0uPxBhkSfpPlPWk0xAHai/jUiNIjONl +FHlHOu+OvORx8sR8Bj2aacPygSbY +-----END CERTIFICATE----- diff --git a/mysql-test/std_data/galera-reload-server-cert.pem b/mysql-test/std_data/galera-reload-server-cert.pem new file mode 100644 index 00000000000..6b69a6cbaf5 --- /dev/null +++ b/mysql-test/std_data/galera-reload-server-cert.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIUFe5PYLfLZY1SL5DEZcrmxn8tDlMwDQYJKoZIhvcNAQEL +BQAwPzELMAkGA1UEBhMCVVMxEDAOBgNVBAoMB1BlcmNvbmExHjAcBgNVBAMMFUdh +bGVyYSBSZWxvYWQgVGVzdCBDQTAgFw0yNjExMTIxNDQxNTJaGA8yMTI2MTAxOTE0 +NDE1MlowQzELMAkGA1UEBhMCVVMxEDAOBgNVBAoMB1BlcmNvbmExIjAgBgNVBAMM +GUdhbGVyYSBSZWxvYWQgVGVzdCBTZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDqtnpnk/k8KgUPggJgGm1Py7UnT2UHX37ItQ+AJixcWAfkQ4BE +mMYTunczpXxV9EguvRyRRNuBx0g8ukSsQRbs2cowbkEy7i7BTcW11W6/fbSGiBmm +wGkJGto81Jcm4aH1wSrWmZMRxzM1uygkZyPBf7hkijhCgSTLZBPTCAf1a7w4bgpP +Alod0VJT9+2Xm810xS7IqJQzzWF7bdEO9RcWDaDoYXdgr4jhLMFG/d5GQj8XQHmF +XQCZcWnUTp2qNykwseol6deFFZiQ4sUEWqDQ4Y+EIUHf/LYAK2Fk1rYyoOEyGN8U +6tSq9Ul8dldjHs2uFrlnXWmS+FoediZwS0XvAgMBAAGjfDB6MAkGA1UdEwQCMAAw +DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAd +BgNVHQ4EFgQUD2MdkYe9sLEC6lkBDPlH8tU1sjMwHwYDVR0jBBgwFoAUjfO8sDZj +oXAcgKHsyl813gbR3DwwDQYJKoZIhvcNAQELBQADggEBADLdas6eDi2wrmCYwySI +0bJijkh7cZ1LpdGJPQhEiYsnpDIWE/7azqiPGtv5qaOug0Mtdx2/Mc0++BpvZzMF +6IDEJsvq/ux7Pm91E8urYB+nriq5+rAU85NpkD3wfa6MukVf6rdq5Sch7IIdRlGF +XC8k5z3iK/I2W1ZhnYXU0TjcJrkCPXYqCwcELJh5qkukhEcDHuPg46juSxoeLQ2b +eMqvykpci/UJpeWwsGHIljTfRyd/GBh627LNinVtsku22xZlIzadVCeJDzUB51a5 +kwnhHgNyxZ0vI1BBsKiPwDJzNYwC0k1cpE8OH7WjgXasx8XCQL7zkJc8MnIxYVXK +qfc= +-----END CERTIFICATE----- diff --git a/mysql-test/std_data/galera-reload-server-key.pem b/mysql-test/std_data/galera-reload-server-key.pem new file mode 100644 index 00000000000..ae75144fccf --- /dev/null +++ b/mysql-test/std_data/galera-reload-server-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDqtnpnk/k8KgUP +ggJgGm1Py7UnT2UHX37ItQ+AJixcWAfkQ4BEmMYTunczpXxV9EguvRyRRNuBx0g8 +ukSsQRbs2cowbkEy7i7BTcW11W6/fbSGiBmmwGkJGto81Jcm4aH1wSrWmZMRxzM1 +uygkZyPBf7hkijhCgSTLZBPTCAf1a7w4bgpPAlod0VJT9+2Xm810xS7IqJQzzWF7 +bdEO9RcWDaDoYXdgr4jhLMFG/d5GQj8XQHmFXQCZcWnUTp2qNykwseol6deFFZiQ +4sUEWqDQ4Y+EIUHf/LYAK2Fk1rYyoOEyGN8U6tSq9Ul8dldjHs2uFrlnXWmS+Foe +diZwS0XvAgMBAAECggEAcqNc5sEx7u5RGXF1Co5tzJcg7EnNfQvp50rz/rHmYdYH +SLilahu6R0GAXiPaNjtBlD5+uP9KPTlh8XNC/mUuNtHq/LulMaR/BqAfTIAp/vJ9 +XWYVLUp2IuHQLPzitLVovxkxfK521CyYuQooAZu0rZpdrBGMiAL+vy6qthyKkpW0 +XcfBoD5ihayq+AFhc3YFeywKTyWlm20NdNHU2Z59P5Fijtr5DVAy3y0PKkzuvjE4 +umJPnv+qK+8zdlgqVLyEpYXnmDKeHXcW7ywPsBeSe22GnNuFmjYcHoU+0fNWMdbp +buE/aOka1qnrq0cwSzMu0Zslqq+CtNapym7a/gf/RQKBgQD1MRui8PC8a9uomQig +h5D3EFijLc/w594j4bMCMtwLZXgNswY5bRHHViszR/ZZzt2Wksl7AD51zeRg0vEL +ykL8R+h1p1ShGyyZ79iYpaY5oW8Y7j0jEyvTllWsm1wMozp9KTumnh/iXiPsI3CC +UAfxc5a1u/vp3usdR2DyzZIk+wKBgQD1Dx5cJ5/4u02m2H7FUfqeZjw8XvLIuZSp +E98EFJICxJnsu19UW9LDR4vxXzAjFRERVmTpWxXjKwgWZJtl55e+ae6jmolwAw8c +tL707uRN44ur4fORa5ApNyGEWAYJKpbLUVAtFg2pIrloug4b+nkI8/MDljnIkyys +38dw/oxInQKBgQDDsOgPyiE5IRR1oX5DMS/AIGm+Awhdi5G+LZrDfHgnGFsTA/lJ +yAVShTGBgkPaNcKhNJJd+znep+9IX9NGx61i0Ll1fZGL67ZTPhwu6LacdH3I9gwR +fHGUM/44/t4esAA0eL5FIxrrfptJEpfvSZStXsXAUkKiy+n2uktkPjIQFQKBgAEq +qUJXDfPpMF1y+meGFGNcqTzAVveNqp+DcLRcRLWuqezul22XYlF7rbbgdSI1n3ct +qh1SSbBjLA6vO+4oRBir+G7e9XiLCy9fzOjtmjiktK2EzdwLXwxTLt2qbZztjvo4 +0ODmEfqUJ73P5PFNJ/Za8vU5ad0CllvcVN68134hAoGBANSbqFr25nlB+irqKjgu +etpsE4/PgxJdFOtL7xS9tFEwbY9dKAY2iwIKnYv7HwfTAPLFrf9gFKvuCi/GCLb+ ++ObjDacQ+yv9yBOBkkUhF2HsBL62pjjUAUOzeZK32gh4lBstYyhhqhkUc+jEwvwx +jhMHO2iZM3ZKjIk4G6JgymNI +-----END PRIVATE KEY----- diff --git a/mysql-test/suite/galera/r/galera_ssl_reload_tls.result b/mysql-test/suite/galera/r/galera_ssl_reload_tls.result new file mode 100644 index 00000000000..97e17064239 --- /dev/null +++ b/mysql-test/suite/galera/r/galera_ssl_reload_tls.result @@ -0,0 +1,44 @@ +CALL mtr.add_suppression("Setting parameter 'socket.ssl_reload' to '1' failed"); +CALL mtr.add_suppression("Set options returned"); +CALL mtr.add_suppression("SSL error: Unable to get certificate from 'no_such_cert[.]pem'"); +# restart +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL WSREP; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep_foo; +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ERROR HY000: Failed to set up SSL because of the following SSL library error: Failed to reload TLS for channel wsrep: reloading wsrep provider SSL context failed, see error log +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep NO ROLLBACK ON ERROR; +ERROR HY000: Failed to set up SSL because of the following SSL library error: Failed to reload TLS for channel wsrep: reloading wsrep provider SSL context failed, see error log +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +ERROR HY000: Failed to set up SSL because of the following SSL library error: TLS for channel mysql_main was reloaded, but reloading TLS for channel wsrep failed: reloading wsrep provider SSL context failed, see error log +include/assert_grep.inc [Galera SSL reload failures are logged] +SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; +VARIABLE_VALUE = 'Synced' +1 +SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +VARIABLE_VALUE = 2 +1 +SET @orig_ssl_cert = @@global.ssl_cert; +SET GLOBAL ssl_cert = 'no_such_cert.pem'; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +ERROR HY000: Failed to set up SSL because of the following SSL library error: Unable to get certificate +SET GLOBAL ssl_cert = @orig_ssl_cert; +include/assert_grep.inc [Galera SSL reload is not attempted when mysql_main fails] +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +include/assert_grep.inc [No new Galera SSL reload failures] +# restart +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +SELECT COUNT(*) = 1 FROM t1; +COUNT(*) = 1 +1 +DROP TABLE t1; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +# restart +# restart diff --git a/mysql-test/suite/galera/r/galera_ssl_reload_tls_encrypt.result b/mysql-test/suite/galera/r/galera_ssl_reload_tls_encrypt.result new file mode 100644 index 00000000000..3f5db134fef --- /dev/null +++ b/mysql-test/suite/galera/r/galera_ssl_reload_tls_encrypt.result @@ -0,0 +1,53 @@ +CALL mtr.add_suppression("Setting parameter 'socket.ssl_reload' to '1' failed"); +CALL mtr.add_suppression("Set options returned"); +CALL mtr.add_suppression("Galera TLS was reloaded from the files it was started with"); +# restart +SELECT @@global.pxc_encrypt_cluster_traffic; +@@global.pxc_encrypt_cluster_traffic +1 +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +include/assert_grep.inc [No Galera SSL reload failures with valid files] +SET @orig_ssl_cert = @@global.ssl_cert; +SET GLOBAL ssl_cert = 'MYSQL_TEST_DIR/std_data/server-cert.pem'; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ERROR HY000: Failed to set up SSL because of the following SSL library error: Failed to reload TLS for channel wsrep: reloading wsrep provider SSL context failed, see error log +ALTER INSTANCE RELOAD TLS; +ERROR HY000: Failed to set up SSL because of the following SSL library error: TLS for channel mysql_main was reloaded, but reloading TLS for channel wsrep failed: reloading wsrep provider SSL context failed, see error log +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ERROR HY000: Failed to set up SSL because of the following SSL library error: TLS for channel mysql_main was reloaded, but reloading TLS for channel wsrep failed: reloading wsrep provider SSL context failed, see error log +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; +ERROR HY000: Failed to set up SSL because of the following SSL library error: TLS for channel mysql_main was reloaded, but reloading TLS for channel wsrep failed: reloading wsrep provider SSL context failed, see error log +include/assert_grep.inc [Channel mysql_main reloads Galera SSL] +SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; +VARIABLE_VALUE = 'Synced' +1 +SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +VARIABLE_VALUE = 2 +1 +ALTER INSTANCE RELOAD TLS; +Warnings: +Warning 3888 Failed to set up SSL because of the following SSL library error: Galera TLS was reloaded from the files it was started with, which differ from the current server settings: ssl_cert='MYSQL_TEST_DIR/std_data/server-cert.pem' (Galera uses 'MYSQLTEST_VARDIR/tmp/galera_reload_enc_cert.pem'). A server restart is needed for Galera to use them +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +Warnings: +Warning 3888 Failed to set up SSL because of the following SSL library error: Galera TLS was reloaded from the files it was started with, which differ from the current server settings: ssl_cert='MYSQL_TEST_DIR/std_data/server-cert.pem' (Galera uses 'MYSQLTEST_VARDIR/tmp/galera_reload_enc_cert.pem'). A server restart is needed for Galera to use them +include/assert_grep.inc [Path mismatch is written to the error log] +SET GLOBAL ssl_cert = @orig_ssl_cert; +ALTER INSTANCE RELOAD TLS; +include/assert_grep.inc [No new path mismatch warnings] +include/assert_grep.inc [No new Galera SSL reload failures] +# restart +SELECT @@global.wsrep_provider; +@@global.wsrep_provider +none +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ERROR HY000: Failed to set up SSL because of the following SSL library error: Failed to reload TLS for channel wsrep: wsrep provider is not loaded +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +ERROR HY000: Failed to set up SSL because of the following SSL library error: TLS for channel mysql_main was reloaded, but reloading TLS for channel wsrep failed: wsrep provider is not loaded +# restart diff --git a/mysql-test/suite/galera/r/galera_ssl_reload_tls_no_ssl.result b/mysql-test/suite/galera/r/galera_ssl_reload_tls_no_ssl.result new file mode 100644 index 00000000000..a3676dd685e --- /dev/null +++ b/mysql-test/suite/galera/r/galera_ssl_reload_tls_no_ssl.result @@ -0,0 +1,21 @@ +CALL mtr.add_suppression("Galera TLS is not enabled"); +SELECT @@global.pxc_encrypt_cluster_traffic; +@@global.pxc_encrypt_cluster_traffic +0 +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +Warnings: +Warning 3888 Failed to set up SSL because of the following SSL library error: Galera TLS is not enabled (socket.ssl is off), nothing was reloaded for channel wsrep +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep NO ROLLBACK ON ERROR; +Warnings: +Warning 3888 Failed to set up SSL because of the following SSL library error: Galera TLS is not enabled (socket.ssl is off), nothing was reloaded for channel wsrep +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +Warnings: +Warning 3888 Failed to set up SSL because of the following SSL library error: Galera TLS is not enabled (socket.ssl is off), nothing was reloaded for channel wsrep +include/assert_grep.inc [No Galera SSL reload failures when Galera SSL is disabled] +SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; +VARIABLE_VALUE = 'Synced' +1 +SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +VARIABLE_VALUE = 2 +1 diff --git a/mysql-test/suite/galera/t/galera_ssl_reload_tls.cnf b/mysql-test/suite/galera/t/galera_ssl_reload_tls.cnf new file mode 100644 index 00000000000..221c5e8b97b --- /dev/null +++ b/mysql-test/suite/galera/t/galera_ssl_reload_tls.cnf @@ -0,0 +1,7 @@ +!include ../galera_2nodes.cnf + +[mysqld.1] +wsrep_provider_options='base_port=@mysqld.1.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera-upgrade-ca-cert.pem;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem;pc.ignore_sb=true;@ENV.WSREP_PROVIDER_TIMEOUTS' + +[mysqld.2] +wsrep_provider_options='base_port=@mysqld.2.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera-upgrade-ca-cert.pem;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem;pc.ignore_sb=true;@ENV.WSREP_PROVIDER_TIMEOUTS' diff --git a/mysql-test/suite/galera/t/galera_ssl_reload_tls.test b/mysql-test/suite/galera/t/galera_ssl_reload_tls.test new file mode 100644 index 00000000000..9599cb0e27d --- /dev/null +++ b/mysql-test/suite/galera/t/galera_ssl_reload_tls.test @@ -0,0 +1,176 @@ +# +# Test ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep / mysql_main_and_wsrep. +# +# Channel wsrep reloads the Galera SSL context (socket.ssl_ca, socket.ssl_cert, +# socket.ssl_key), the same way as +# SET GLOBAL wsrep_provider_options='socket.ssl_reload=1'. +# Channel mysql_main_and_wsrep reloads mysql_main first and then wsrep. +# Here pxc_encrypt_cluster_traffic=OFF, so channel mysql_main (plain +# ALTER INSTANCE RELOAD TLS and FOR CHANNEL mysql_main) reloads mysql_main +# only (see galera_ssl_reload_tls_encrypt for the ON case). +# +# Both nodes start with galera-cert.pem, trusting galera-upgrade-ca-cert.pem. +# Node #1 then rotates to galera-reload-server-cert.pem, issued by the +# unrelated galera-reload-ca-cert.pem, and node #2 is restarted trusting only +# galera-reload-ca-cert.pem, so it can rejoin only if the reload took effect. +# + +--source include/galera_cluster.inc + +--let $ssl_ca = $MYSQLTEST_VARDIR/tmp/galera_reload_ca.pem +--let $ssl_cert = $MYSQLTEST_VARDIR/tmp/galera_reload_cert.pem +--let $ssl_key = $MYSQLTEST_VARDIR/tmp/galera_reload_key.pem +--let $error_log = $MYSQLTEST_VARDIR/log/mysqld.1.err + +--connection node_1 +CALL mtr.add_suppression("Setting parameter 'socket.ssl_reload' to '1' failed"); +CALL mtr.add_suppression("Set options returned"); +CALL mtr.add_suppression("SSL error: Unable to get certificate from 'no_such_cert[.]pem'"); + +# 1. Restart node #1 with the Galera SSL files placed in a writable location + +--copy_file $MYSQL_TEST_DIR/std_data/galera-upgrade-ca-cert.pem $ssl_ca +--copy_file $MYSQL_TEST_DIR/std_data/galera-cert.pem $ssl_cert +--copy_file $MYSQL_TEST_DIR/std_data/galera-key.pem $ssl_key + +--source include/shutdown_mysqld.inc +--let $do_not_echo_parameters = 1 +--let $start_mysqld_params = --wsrep-cluster-address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 --wsrep_provider_options=base_port=$NODE_GALERAPORT_1;socket.ssl=yes;socket.ssl_ca=$ssl_ca;socket.ssl_cert=$ssl_cert;socket.ssl_key=$ssl_key;pc.ignore_sb=true +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc +--let $do_not_echo_parameters = 0 + +--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment' +--source include/wait_condition.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +# 2. Valid Galera SSL files: all channels reload successfully + +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL WSREP; + +--error ER_SYNTAX_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep_foo; + +# 3. An invalid Galera certificate makes the Galera reload fail. +# The node keeps working with the previous Galera SSL context. + +--remove_file $ssl_cert +--write_file $ssl_cert END_OF_FILE +This is not a certificate +END_OF_FILE + +# Galera SSL is not touched by mysql_main reload +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; + +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; + +# NO ROLLBACK ON ERROR does not apply to wsrep +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep NO ROLLBACK ON ERROR; + +# mysql_main is reloaded, wsrep fails: the statement returns an error +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; + +--let $assert_text = Galera SSL reload failures are logged +--let $assert_file = $error_log +--let $assert_select = Setting parameter 'socket.ssl_reload' to '1' failed +--let $assert_only_after = CURRENT_TEST: galera.galera_ssl_reload_tls +--let $assert_count = 3 +--source include/assert_grep.inc + +SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; +SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + +# 4. mysql_main reload failure stops mysql_main_and_wsrep before wsrep + +SET @orig_ssl_cert = @@global.ssl_cert; +SET GLOBAL ssl_cert = 'no_such_cert.pem'; +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; +SET GLOBAL ssl_cert = @orig_ssl_cert; + +--let $assert_text = Galera SSL reload is not attempted when mysql_main fails +--source include/assert_grep.inc + +# 5. Replace the Galera CA, certificate and key in place and reload them. +# The new certificate is issued by a CA unrelated to galera-cert.pem. +# The new CA file trusts both the old and the new CA, so node #1 still +# accepts node #2, which keeps presenting galera-cert.pem. + +--remove_file $ssl_ca +--remove_file $ssl_cert +--remove_file $ssl_key +--copy_file $MYSQL_TEST_DIR/std_data/galera-reload-ca-bundle.pem $ssl_ca +--copy_file $MYSQL_TEST_DIR/std_data/galera-reload-server-cert.pem $ssl_cert +--copy_file $MYSQL_TEST_DIR/std_data/galera-reload-server-key.pem $ssl_key + +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; + +--let $assert_text = No new Galera SSL reload failures +--source include/assert_grep.inc + +# 6. Restart node #2 trusting only the new CA. It rejects galera-cert.pem, +# so it can rejoin only if node #1 presents the reloaded certificate. + +--connection node_2 +--let $do_not_echo_parameters = 1 +--let $restart_parameters = restart: --wsrep_provider_options=base_port=$NODE_GALERAPORT_2;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/galera-reload-ca-cert.pem;socket.ssl_cert=$MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=$MYSQL_TEST_DIR/std_data/galera-key.pem;pc.ignore_sb=true +--source include/restart_mysqld.inc +--let $do_not_echo_parameters = 0 + +--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment' +--source include/wait_condition.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); + +--connection node_1 +SELECT COUNT(*) = 1 FROM t1; +DROP TABLE t1; + +# 7. Cleanup. Rotate node #1 back to galera-cert.pem, so that node #2 can +# rejoin with its original configuration (galera-upgrade-ca-cert.pem does +# not trust the new certificate). Then restart node #2 and node #1 with +# their original Galera SSL configuration. + +--remove_file $ssl_cert +--remove_file $ssl_key +--copy_file $MYSQL_TEST_DIR/std_data/galera-cert.pem $ssl_cert +--copy_file $MYSQL_TEST_DIR/std_data/galera-key.pem $ssl_key +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; + +--connection node_2 +--let $restart_parameters = restart +--source include/restart_mysqld.inc + +--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment' +--source include/wait_condition.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +--connection node_1 +--source include/shutdown_mysqld.inc +--let $do_not_echo_parameters = 1 +--let $start_mysqld_params = --wsrep-cluster-address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc +--let $do_not_echo_parameters = 0 + +--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment' +--source include/wait_condition.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +--remove_file $ssl_ca +--remove_file $ssl_cert +--remove_file $ssl_key diff --git a/mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.cnf b/mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.cnf new file mode 100644 index 00000000000..fe534dfea62 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.cnf @@ -0,0 +1,4 @@ +!include ../galera_2nodes.cnf + +[mysqld] +pxc-encrypt-cluster-traffic=ON diff --git a/mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.test b/mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.test new file mode 100644 index 00000000000..99c6a1136a4 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_ssl_reload_tls_encrypt.test @@ -0,0 +1,168 @@ +# +# Test ALTER INSTANCE RELOAD TLS with pxc_encrypt_cluster_traffic=ON. +# +# With pxc_encrypt_cluster_traffic=ON, Galera SSL (socket.ssl_ca, +# socket.ssl_cert, socket.ssl_key) is configured from the server +# ssl_ca/ssl_cert/ssl_key at startup. So channel mysql_main (both plain +# ALTER INSTANCE RELOAD TLS and FOR CHANNEL mysql_main) works like +# FOR CHANNEL mysql_main_and_wsrep when a wsrep provider is configured, +# and reloads mysql_main only when wsrep_provider=none. +# +# Galera keeps the file paths from startup. To make only the Galera reload +# fail, the test points the server ssl_cert at another valid certificate +# and corrupts the file that Galera was started with. +# + +--source include/galera_cluster.inc + +--let $ssl_ca = $MYSQLTEST_VARDIR/tmp/galera_reload_enc_ca.pem +--let $ssl_cert = $MYSQLTEST_VARDIR/tmp/galera_reload_enc_cert.pem +--let $ssl_key = $MYSQLTEST_VARDIR/tmp/galera_reload_enc_key.pem +--let $error_log = $MYSQLTEST_VARDIR/log/mysqld.1.err + +--connection node_1 +CALL mtr.add_suppression("Setting parameter 'socket.ssl_reload' to '1' failed"); +CALL mtr.add_suppression("Set options returned"); +CALL mtr.add_suppression("Galera TLS was reloaded from the files it was started with"); + +# 1. Restart node #1 with the SSL files placed in a writable location. +# Galera SSL is configured from them by pxc_encrypt_cluster_traffic. + +--copy_file $MYSQL_TEST_DIR/std_data/cacert.pem $ssl_ca +--copy_file $MYSQL_TEST_DIR/std_data/server-cert.pem $ssl_cert +--copy_file $MYSQL_TEST_DIR/std_data/server-key.pem $ssl_key + +--source include/shutdown_mysqld.inc +--let $do_not_echo_parameters = 1 +--let $start_mysqld_params = --wsrep-cluster-address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 --ssl-ca=$ssl_ca --ssl-cert=$ssl_cert --ssl-key=$ssl_key +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc +--let $do_not_echo_parameters = 0 + +--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment' +--source include/wait_condition.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +SELECT @@global.pxc_encrypt_cluster_traffic; + +# 2. Valid SSL files: all forms succeed + +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; + +--let $assert_file = $error_log +--let $assert_select = Setting parameter 'socket.ssl_reload' to '1' failed +--let $assert_only_after = CURRENT_TEST: galera.galera_ssl_reload_tls_encrypt +--let $assert_text = No Galera SSL reload failures with valid files +--let $assert_count = 0 +--source include/assert_grep.inc + +# 3. Server ssl_cert points to a valid certificate, the file Galera was +# started with is corrupted: only the Galera reload fails. + +SET @orig_ssl_cert = @@global.ssl_cert; +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR +eval SET GLOBAL ssl_cert = '$MYSQL_TEST_DIR/std_data/server-cert.pem'; + +--remove_file $ssl_cert +--write_file $ssl_cert END_OF_FILE +This is not a certificate +END_OF_FILE + +# Explicit wsrep channel first: proves that Galera rejects the file. +# A Galera failure after a successful mysql_main reload says so in the error. +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; + +# mysql_main channel (plain or explicit) reloads Galera SSL as well +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS; + +# NO ROLLBACK ON ERROR does not apply to wsrep +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; + +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; + +--let $assert_text = Channel mysql_main reloads Galera SSL +--let $assert_count = 4 +--source include/assert_grep.inc + +# The node keeps working with the previous Galera SSL context +SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; +SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + +# 4. Fix the file: plain RELOAD TLS succeeds again. Server ssl_cert still +# differs from the path Galera was started with, so a warning says that +# Galera reloaded its own files and needs a restart to use the new path. + +--remove_file $ssl_cert +--copy_file $MYSQL_TEST_DIR/std_data/server-cert.pem $ssl_cert + +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +ALTER INSTANCE RELOAD TLS; +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; + +--let $assert_text = Path mismatch is written to the error log +--let $assert_select = Galera TLS was reloaded from the files it was started with +--let $assert_count = 2 +--source include/assert_grep.inc + +# Paths match again: no warning +SET GLOBAL ssl_cert = @orig_ssl_cert; +ALTER INSTANCE RELOAD TLS; + +--let $assert_text = No new path mismatch warnings +--source include/assert_grep.inc +--let $assert_select = Setting parameter 'socket.ssl_reload' to '1' failed + +--let $assert_text = No new Galera SSL reload failures +--let $assert_count = 4 +--source include/assert_grep.inc + +# 5. wsrep_provider=none: channel mysql_main reloads mysql_main only, +# the explicit wsrep channels fail + +--source include/shutdown_mysqld.inc +--let $do_not_echo_parameters = 1 +--let $start_mysqld_params = --wsrep-provider=none --ssl-ca=$ssl_ca --ssl-cert=$ssl_cert --ssl-key=$ssl_key +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc +--let $do_not_echo_parameters = 0 + +SELECT @@global.wsrep_provider; + +ALTER INSTANCE RELOAD TLS; +ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main; + +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; + +# mysql_main is reloaded, wsrep fails +--error ER_DA_SSL_LIBRARY_ERROR +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; + +# 6. Cleanup: restart node #1 with its original configuration + +--source include/shutdown_mysqld.inc +--let $do_not_echo_parameters = 1 +--let $start_mysqld_params = --wsrep-cluster-address=gcomm://127.0.0.1:$NODE_GALERAPORT_2 +--source include/start_mysqld.inc +--source include/wait_until_connected_again.inc +--let $do_not_echo_parameters = 0 + +--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment' +--source include/wait_condition.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +--remove_file $ssl_ca +--remove_file $ssl_cert +--remove_file $ssl_key diff --git a/mysql-test/suite/galera/t/galera_ssl_reload_tls_no_ssl.test b/mysql-test/suite/galera/t/galera_ssl_reload_tls_no_ssl.test new file mode 100644 index 00000000000..5fe7f6ef906 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_ssl_reload_tls_no_ssl.test @@ -0,0 +1,32 @@ +# +# Test ALTER INSTANCE RELOAD TLS when Galera SSL is not enabled +# (socket.ssl is not set, pxc_encrypt_cluster_traffic=OFF). +# +# Galera ignores socket.ssl_reload when SSL is disabled, so the wsrep +# channels succeed with a warning saying that nothing was reloaded, and +# channel mysql_main (plain RELOAD TLS too) reloads mysql_main only. +# + +--source include/galera_cluster.inc + +--connection node_1 +CALL mtr.add_suppression("Galera TLS is not enabled"); + +SELECT @@global.pxc_encrypt_cluster_traffic; + +ALTER INSTANCE RELOAD TLS; + +# Galera TLS is off: warning, nothing reloaded for channel wsrep +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep; +ALTER INSTANCE RELOAD TLS FOR CHANNEL wsrep NO ROLLBACK ON ERROR; +ALTER INSTANCE RELOAD TLS FOR CHANNEL mysql_main_and_wsrep; + +--let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err +--let $assert_select = Setting parameter 'socket.ssl_reload' to '1' failed +--let $assert_only_after = CURRENT_TEST: galera.galera_ssl_reload_tls_no_ssl +--let $assert_text = No Galera SSL reload failures when Galera SSL is disabled +--let $assert_count = 0 +--source include/assert_grep.inc + +SELECT VARIABLE_VALUE = 'Synced' FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; +SELECT VARIABLE_VALUE = 2 FROM performance_schema.global_status WHERE VARIABLE_NAME = 'wsrep_cluster_size'; diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 90105320d43..10f34dc1b0a 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -112,6 +112,7 @@ #ifdef WITH_WSREP #include "sql/dd/cache/dictionary_client.h" // dd::cache::Dictionary_client #include "sql/dd/types/table.h" // dd::Table +#include "sql/wsrep_var.h" // wsrep_reload_ssl #endif /* WITH_WSREP */ bool Column_name_comparator::operator()(const String *lhs, @@ -2245,7 +2246,39 @@ class Alter_instance_reload_tls : public Alter_instance { return true; } - bool res = false; + if (reload_mysql_ && reload_mysql_channel()) return true; + +#ifdef WITH_WSREP + if (reload_wsrep_ && reload_wsrep_channel()) return true; +#endif /* WITH_WSREP */ + + my_ok(m_thd); + return false; + } + ~Alter_instance_reload_tls() override = default; + + static bool register_callback(ssl_reload_callback_t c) { + auto it = std::find(callbacks_.begin(), callbacks_.end(), c); + if (it != callbacks_.end()) return false; + callbacks_.push_back(c); + return true; + } + + static bool deregister_callback(ssl_reload_callback_t c) { + auto it = std::find(callbacks_.begin(), callbacks_.end(), c); + if (it == callbacks_.end()) return false; + callbacks_.erase(it); + return true; + } + + protected: + /** + Reload the MySQL TLS channel selected by context_type_. + + @retval false success (possibly with warnings) + @retval true failure, error reported + */ + bool reload_mysql_channel() { enum enum_ssl_init_error error = SSL_INITERR_NOERROR; switch (context_type_) { case Ssl_acceptor_context_type::context_server_main: @@ -2271,48 +2304,100 @@ class Alter_instance_reload_tls : public Alter_instance { LogErr(WARNING_LEVEL, ER_SSL_LIBRARY_ERROR, sslGetErrString(error)); } else { my_error(ER_DA_SSL_LIBRARY_ERROR, MYF(0), error_text); - res = true; + return true; } } - if (!res) { - String specified_channel(channel_name_.str, channel_name_.length, - system_charset_info); - if (!my_strcasecmp(system_charset_info, mysql_main_channel.c_str(), - specified_channel.ptr())) { - for (auto const &cb : callbacks_) { - if (!cb(nullptr)) { - push_warning_printf(m_thd, Sql_condition::SL_WARNING, - ER_DA_SSL_LIBRARY_ERROR, - ER_THD(m_thd, ER_DA_SSL_LIBRARY_ERROR), - "One of the TLS reload callbacks failed"); - LogErr(WARNING_LEVEL, ER_SSL_LIBRARY_ERROR, - "One of the TLS reload callbacks failed"); - } - }; - } - - my_ok(m_thd); + if (context_type_ == Ssl_acceptor_context_type::context_server_main) { + for (auto const &cb : callbacks_) { + if (!cb(nullptr)) { + push_warning_printf(m_thd, Sql_condition::SL_WARNING, + ER_DA_SSL_LIBRARY_ERROR, + ER_THD(m_thd, ER_DA_SSL_LIBRARY_ERROR), + "One of the TLS reload callbacks failed"); + LogErr(WARNING_LEVEL, ER_SSL_LIBRARY_ERROR, + "One of the TLS reload callbacks failed"); + } + }; } - return res; + return false; } - ~Alter_instance_reload_tls() override = default; - static bool register_callback(ssl_reload_callback_t c) { - auto it = std::find(callbacks_.begin(), callbacks_.end(), c); - if (it != callbacks_.end()) return false; - callbacks_.push_back(c); - return true; +#ifdef WITH_WSREP + /** Push a warning to the client and write it to the error log. */ + void push_wsrep_warning(const std::string &text) { + push_warning_printf(m_thd, Sql_condition::SL_WARNING, + ER_DA_SSL_LIBRARY_ERROR, + ER_THD(m_thd, ER_DA_SSL_LIBRARY_ERROR), text.c_str()); + WSREP_WARN("%s", text.c_str()); } - static bool deregister_callback(ssl_reload_callback_t c) { - auto it = std::find(callbacks_.begin(), callbacks_.end(), c); - if (it == callbacks_.end()) return false; - callbacks_.erase(it); - return true; + /** + Reload the wsrep (Galera) TLS channel. + + If reload_mysql_ is set, mysql_main has already been reloaded at this + point. A wsrep failure is still reported as an error, and the error text + says that the statement was partially applied. + + @retval false success (possibly with warnings) + @retval true failure, error reported + */ + bool reload_wsrep_channel() { + std::string error_text; + Wsrep_ssl_settings galera_ssl; + if (wsrep_reload_ssl(error_text, galera_ssl)) { + error_text = + (reload_mysql_ ? "TLS for channel mysql_main was reloaded, " + "but reloading TLS for channel wsrep " + "failed: " + : "Failed to reload TLS for channel wsrep: ") + + error_text; + my_error(ER_DA_SSL_LIBRARY_ERROR, MYF(0), error_text.c_str()); + return true; + } + + if (!galera_ssl.enabled) { + push_wsrep_warning( + "Galera TLS is not enabled (socket.ssl is off), nothing was " + "reloaded for channel wsrep"); + return false; + } + + if (pxc_encrypt_cluster_traffic) warn_wsrep_ssl_paths_changed(galera_ssl); + return false; } - protected: + /** + With pxc_encrypt_cluster_traffic=ON Galera gets ssl_key/ssl_ca/ssl_cert + when the provider is loaded and cannot change them at runtime. Warn if + the server options now point to other files than Galera uses. + */ + void warn_wsrep_ssl_paths_changed(const Wsrep_ssl_settings &galera_ssl) { + OptionalString ca, cert, key; + server_main_callback.read_parameters(&ca, nullptr, nullptr, &cert, nullptr, + nullptr, &key, nullptr, nullptr, + nullptr, nullptr); + std::string changed; + auto check = [&changed](const char *name, const OptionalString &server, + const std::string &galera) { + const char *server_path = server.c_str() ? server.c_str() : ""; + if (galera == server_path) return; + if (!changed.empty()) changed += ", "; + changed += std::string(name) + "='" + server_path + "' (Galera uses '" + + galera + "')"; + }; + check("ssl_ca", ca, galera_ssl.ca); + check("ssl_cert", cert, galera_ssl.cert); + check("ssl_key", key, galera_ssl.key); + if (changed.empty()) return; + + push_wsrep_warning( + "Galera TLS was reloaded from the files it was started with, which " + "differ from the current server settings: " + + changed + ". A server restart is needed for Galera to use them"); + } +#endif /* WITH_WSREP */ + bool match_channel_name() { String specified_channel(channel_name_.str, channel_name_.length, system_charset_info); @@ -2321,6 +2406,15 @@ class Alter_instance_reload_tls : public Alter_instance { if (!my_strcasecmp(system_charset_info, mysql_main_channel.c_str(), specified_channel.ptr())) { context_type_ = Ssl_acceptor_context_type::context_server_main; +#ifdef WITH_WSREP + /* + mysql_main is also used by plain ALTER INSTANCE RELOAD TLS. + With pxc_encrypt_cluster_traffic=ON Galera SSL is configured from the + mysql_main SSL options, so if a wsrep provider is configured, reload + Galera SSL as well (as mysql_main_and_wsrep does). + */ + reload_wsrep_ = pxc_encrypt_cluster_traffic && wsrep_provider_set; +#endif /* WITH_WSREP */ return true; } if (!my_strcasecmp(system_charset_info, mysql_admin_channel.c_str(), @@ -2328,14 +2422,37 @@ class Alter_instance_reload_tls : public Alter_instance { context_type_ = Ssl_acceptor_context_type::context_server_admin; return true; } +#ifdef WITH_WSREP + if (!my_strcasecmp(system_charset_info, wsrep_channel, + specified_channel.ptr())) { + reload_mysql_ = false; + reload_wsrep_ = true; + return true; + } + if (!my_strcasecmp(system_charset_info, mysql_main_and_wsrep_channel, + specified_channel.ptr())) { + context_type_ = Ssl_acceptor_context_type::context_server_main; + reload_wsrep_ = true; + return true; + } +#endif /* WITH_WSREP */ return false; } protected: +#ifdef WITH_WSREP + static constexpr const char *wsrep_channel = "wsrep"; + static constexpr const char *mysql_main_and_wsrep_channel = + "mysql_main_and_wsrep"; +#endif /* WITH_WSREP */ + LEX_CSTRING channel_name_; bool force_; - Ssl_acceptor_context_type context_type_; + Ssl_acceptor_context_type context_type_{ + Ssl_acceptor_context_type::context_last}; + bool reload_mysql_{true}; + bool reload_wsrep_{false}; static std::vector callbacks_; }; diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 3da7554bfcf..2cb3c5ce351 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -17,6 +17,7 @@ #include #include +#include #include "my_dir.h" #include "mysql/components/services/log_builtins.h" #include "mysqld.h" @@ -486,6 +487,86 @@ bool wsrep_provider_options_update(sys_var *, THD *, enum_var_type) { return refresh_provider_options(); } +static std::string_view trim_spaces(std::string_view s) { + while (!s.empty() && my_isspace(&my_charset_latin1, s.front())) + s.remove_prefix(1); + while (!s.empty() && my_isspace(&my_charset_latin1, s.back())) + s.remove_suffix(1); + return s; +} + +/** + Find the value of option opt_name in a provider options string, which + Galera formats as "key1 = value1; key2 = value2; ". + + @retval true option found, value set + @retval false option not found +*/ +static bool find_provider_option(const char *opts, std::string_view opt_name, + std::string &value) { + if (opts == nullptr) return false; + std::string_view rest(opts); + while (!rest.empty()) { + const size_t end = rest.find(';'); + const std::string_view item = rest.substr(0, end); + rest = (end == std::string_view::npos) ? std::string_view() + : rest.substr(end + 1); + const size_t eq = item.find('='); + if (eq == std::string_view::npos) continue; + if (trim_spaces(item.substr(0, eq)) != opt_name) continue; + value.assign(trim_spaces(item.substr(eq + 1))); + return true; + } + return false; +} + +/** Galera accepts yes/no, true/false, on/off and 1/0 for boolean options. */ +static bool provider_option_is_true(const std::string &value) { + for (const char *t : {"yes", "true", "on", "1"}) + if (!my_strcasecmp(&my_charset_latin1, value.c_str(), t)) return true; + return false; +} + +static void read_provider_ssl_settings(Wsrep_ssl_settings &settings) { + std::string use_ssl; + settings.enabled = + find_provider_option(wsrep_provider_options, "socket.ssl", use_ssl) && + provider_option_is_true(use_ssl); + find_provider_option(wsrep_provider_options, "socket.ssl_key", settings.key); + find_provider_option(wsrep_provider_options, "socket.ssl_ca", settings.ca); + find_provider_option(wsrep_provider_options, "socket.ssl_cert", + settings.cert); +} + +bool wsrep_reload_ssl(std::string &error, Wsrep_ssl_settings &settings) { + /* Same locking as SET GLOBAL wsrep_provider_options='socket.ssl_reload=1' */ + mysql_mutex_lock(&LOCK_global_system_variables); + + bool ret = false; + if (!wsrep_provider_set || + !Wsrep_server_state::instance().is_provider_loaded()) { + error = "wsrep provider is not loaded"; + ret = true; + } else { + enum wsrep::provider::status status = + Wsrep_server_state::instance().provider().options( + "socket.ssl_reload=1"); + if (status) { + WSREP_ERROR("Set options returned %d", status); + error = "reloading wsrep provider SSL context failed, see error log"; + ret = true; + } + if (refresh_provider_options() && !ret) { + error = "failed to refresh wsrep provider options"; + ret = true; + } + if (!ret) read_provider_ssl_settings(settings); + } + + mysql_mutex_unlock(&LOCK_global_system_variables); + return ret; +} + void wsrep_provider_options_init(const char *value) { if (wsrep_provider_options && wsrep_provider_options != value) my_free(const_cast(wsrep_provider_options)); diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h index d123f935c7a..626ecf155ae 100644 --- a/sql/wsrep_var.h +++ b/sql/wsrep_var.h @@ -25,6 +25,8 @@ // MySQL variables funcs +#include + #include "query_options.h" #include "set_var.h" class sys_var; @@ -55,6 +57,24 @@ extern void wsrep_provider_init INIT_ARGS; extern bool wsrep_provider_options_check CHECK_ARGS; extern bool wsrep_provider_options_update UPDATE_ARGS; extern void wsrep_provider_options_init INIT_ARGS; +/** Galera TLS settings, as reported by the provider. */ +struct Wsrep_ssl_settings { + bool enabled{false}; ///< socket.ssl + std::string key; ///< socket.ssl_key + std::string ca; ///< socket.ssl_ca + std::string cert; ///< socket.ssl_cert +}; + +/** + Reload wsrep provider SSL context, equivalent of + SET GLOBAL wsrep_provider_options='socket.ssl_reload=1'. + + @param[out] error error description on failure + @param[out] settings Galera TLS settings after the reload (on success) + @retval false success + @retval true failure +*/ +extern bool wsrep_reload_ssl(std::string &error, Wsrep_ssl_settings &settings); extern bool wsrep_cluster_address_check CHECK_ARGS; extern bool wsrep_cluster_address_update UPDATE_ARGS;