Fix bootstrapping mechanism

As part of MySQL Server release 8.4.0, the server option
`--ssl` has been removed.

This change affected the bootstrapping mechanism used by
Connector/Python for running tests. This patch fixes the
issue by utilizing the option `--require_secure_transport`
as a replacement.

Change-Id: I5386c5296bca93626f81520ac18685d249723dd1

Author: oscpache

mysql-connector-python/tests/mysqld.py

@@ -645,6 +645,9 @@ def mysqlx_unix_socket(self):
         return self._mysqlx_unix_socket
 
     def update_config(self, **kwargs):
+        if kwargs.get("ssl"):
+            kwargs["ssl"] = "on" if kwargs["ssl"] else "off"
+
         options = {
             "name": self._name,
             "basedir": _convert_forward_slash(self._basedir),
@@ -663,7 +666,7 @@ def update_config(self, **kwargs):
             "pid_file": _convert_forward_slash(self._pid_file),
             "serverid": self._serverid,
             "lc_messages_dir": _convert_forward_slash(self._lc_messages_dir),
-            "ssl": 1,
+            "ssl": "off",
         }
 
         cnf = kwargs.pop("my_cnf", self._cnf)

mysql-connector-python/tests/test_bugs.py

@@ -4789,15 +4789,15 @@ def _enable_ssl(self):
         self.server.stop()
         self.server.wait_down()
 
-        self.server.start()
+        self.server.start(ssl=1)
         self.server.wait_up()
         time.sleep(1)
 
-    def _verify_ssl(self, cnx, available=True):
+    def _verify_ssl(self, cnx, ssl_available=True):
         cur = cnx.cursor()
         cur.execute("SHOW STATUS LIKE 'Ssl_version'")
         result = cur.fetchall()[0]
-        if available:
+        if ssl_available:
             self.assertNotEqual(result[1], "")
         else:
             self.assertEqual(result[1], "")
@@ -4812,33 +4812,24 @@ def test_ssl_disabled_cext(self):
         self._test_ssl_modes()
 
     def _test_ssl_modes(self):
+        # SSL isn't disabled by default on the connector side,
+        # however, it is disabled, on the custom bootstrapped server.
         config = self.config.copy()
-        # With SSL on server
-        # default
-        cnx = mysql.connector.connect(**config)
-        self._verify_ssl(cnx)
 
         # disabled
         config["ssl_disabled"] = True
         cnx = mysql.connector.connect(**config)
-        self._verify_ssl(cnx, False)
+        self._verify_ssl(cnx, ssl_available=False)
 
-        self._disable_ssl()
-        config = self.config.copy()
-        config["ssl_ca"] = tests.SSL_CA
-        # Without SSL on server
+        # With SSL on server
         try:
-            # default
-            cnx = mysql.connector.connect(**config)
-            self._verify_ssl(cnx, False)
-
-            # disabled
-            config["ssl_disabled"] = True
+            self._enable_ssl()
+            config["ssl_ca"] = tests.SSL_CA
+            config["ssl_disabled"] = False
             cnx = mysql.connector.connect(**config)
-            self._verify_ssl(cnx, False)
-
+            self._verify_ssl(cnx, ssl_available=True)
         finally:
-            self._enable_ssl()
+            self._disable_ssl()
 
 
 class BugOra25589496(tests.MySQLConnectorTests):

mysql-connector-python/unittests.py

@@ -168,7 +168,10 @@
         "MYSQL", os.path.join("/", "usr", "local", "mysql")
     )
 
-MY_CNF += "\nssl={ssl}"
+# When this option is enabled, connections attempted using
+# insecure transport will be rejected. Secure transports
+# are SSL/TLS, Unix socket or Shared Memory (on Windows).
+MY_CNF += "\nrequire_secure_transport={ssl}"
 
 MYSQL_DEFAULT_TOPDIR = _TOPDIR
 

mysqlx-connector-python/tests/mysqld.py

@@ -645,6 +645,9 @@ def mysqlx_unix_socket(self):
         return self._mysqlx_unix_socket
 
     def update_config(self, **kwargs):
+        if kwargs.get("ssl"):
+            kwargs["ssl"] = "on" if kwargs["ssl"] else "off"
+
         options = {
             "name": self._name,
             "basedir": _convert_forward_slash(self._basedir),
@@ -663,7 +666,7 @@ def update_config(self, **kwargs):
             "pid_file": _convert_forward_slash(self._pid_file),
             "serverid": self._serverid,
             "lc_messages_dir": _convert_forward_slash(self._lc_messages_dir),
-            "ssl": 1,
+            "ssl": "off",
         }
 
         cnf = kwargs.pop("my_cnf", self._cnf)

mysqlx-connector-python/unittests.py

@@ -165,7 +165,10 @@
         "MYSQL", os.path.join("/", "usr", "local", "mysql")
     )
 
-MY_CNF += "\nssl={ssl}"
+# When this option is enabled, connections attempted using
+# insecure transport will be rejected. Secure transports
+# are SSL/TLS, Unix socket or Shared Memory (on Windows).
+MY_CNF += "\nrequire_secure_transport={ssl}"
 
 MYSQL_DEFAULT_TOPDIR = _TOPDIR