BUG24953913: Fix SSL connection failing tests

amitab · amitab · commit 72e3b78ba934 · 2016-11-15T17:47:23.000+05:30
This patch fixes the connection error using older Python versions
or when using a non SSL enabled connection settings and the Python
installation doesn't have support for SSL.

The SSL connection tests were disabled for Python versions &lt; 2.7.9.
diff --git a/lib/mysqlx/__init__.py b/lib/mysqlx/__init__.py
@@ -117,7 +117,7 @@ def _parse_connection_uri(uri):
     settings["user"], settings["password"] = userinfo.split(":", 1)
 
     if host.startswith(("/", "..", ".")):
-        settings["socket"] = unquote(host).encode("utf-8")
+        settings["socket"] = unquote(host)
     elif host.startswith("\\."):
         raise InterfaceError("Windows Pipe is not supported.")
     else:
diff --git a/lib/mysqlx/connection.py b/lib/mysqlx/connection.py
@@ -85,11 +85,6 @@ def set_ssl(self, ssl_opts={}):
             self.close()
             raise RuntimeError("Python installation has no SSL support.")
 
-        if sys.version_info < (2, 7, 9):
-            self.close()
-            raise RuntimeError("The support for SSL is not available for this "
-                               "Python version.")
-
         context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
         context.load_default_certs()
         if "ssl-ca" in ssl_opts:
@@ -166,13 +161,19 @@ def _handle_capabilities(self):
         data = self.protocol.get_capabilites().capabilities
         if not (data[0].name.lower() == "tls" if data else False):
             if self.settings.get("ssl-enable", False):
+                self.close()
                 raise OperationalError("SSL not enabled at server.")
             return
 
-        ssl_opts_keys = ("ssl-ca", "ssl-crl", "ssl-cert", "ssl-key",)
-        if any(key in self.settings for key in ssl_opts_keys):
-            self.protocol.set_capabilities(tls=True)
-            self.stream.set_ssl(self.settings)
+        if sys.version_info < (2, 7, 9):
+            if self.settings.get("ssl-enable", False):
+                self.close()
+                raise RuntimeError("The support for SSL is not available for "
+                    "this Python version.")
+            return
+
+        self.protocol.set_capabilities(tls=True)
+        self.stream.set_ssl(self.settings)
 
     def _authenticate(self):
         plugin = MySQL41AuthPlugin(self._user, self._password)
diff --git a/src/mysql_capi.c b/src/mysql_capi.c
@@ -1033,6 +1033,7 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
 	unsigned long client_flags= 0;
 	unsigned int port= 3306, tmp_uint;
 	unsigned int protocol= 0;
+  unsigned int ssl_mode;
 	my_bool abool;
 	MYSQL *res;
 
@@ -1115,15 +1116,17 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
 #endif
 #if MYSQL_VERSION_ID >= 50711
         {
-            mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_REQUIRED);
+            ssl_mode= SSL_MODE_REQUIRED;
+            mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);
         }
 #endif
 
         if (ssl_verify_cert && ssl_verify_cert == Py_True)
         {
 #if MYSQL_VERSION_ID >= 50711
             {
-                mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_VERIFY_IDENTITY);
+                ssl_mode= SSL_MODE_VERIFY_IDENTITY;
+                mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);
             }
 #else
             {
@@ -1144,7 +1147,8 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
 #endif
 #if MYSQL_VERSION_ID >= 50711
         {
-            mysql_options(&self->session, MYSQL_OPT_SSL_ENFORCE, SSL_MODE_DISABLED);
+            ssl_mode= SSL_MODE_DISABLED;
+            mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);
         }
 #endif
     }
@@ -1170,6 +1174,11 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
         client_flags= client_flags & ~CLIENT_CONNECT_WITH_DB;
     }
 
+    if (client_flags & CLIENT_LOCAL_FILES) {
+        abool= 1;
+        mysql_options(&self->session, MYSQL_OPT_LOCAL_INFILE, (unsigned int*)&abool);
+    }
+
     res= mysql_real_connect(&self->session,
                             host, user, password, database,
     						port, unix_socket, client_flags);
diff --git a/tests/test_mysqlx_connection.py b/tests/test_mysqlx_connection.py
@@ -31,8 +31,10 @@
 import tests
 import mysqlx
 
-from urllib import quote
-
+if mysqlx.compat.PY3:
+    from urllib.parse import quote
+else:
+    from urllib import quote
 
 LOGGER = logging.getLogger(tests.LOGGER_NAME)
 

Original file line number	Diff line number	Diff line change
`@@ -1033,6 +1033,7 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1033`	`1033`	`unsigned long client_flags= 0;`
`1034`	`1034`	`unsigned int port= 3306, tmp_uint;`
`1035`	`1035`	`unsigned int protocol= 0;`
	`1036`	`+ unsigned int ssl_mode;`
`1036`	`1037`	`my_bool abool;`
`1037`	`1038`	`MYSQL *res;`
`1038`	`1039`
`@@ -1115,15 +1116,17 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1115`	`1116`	`#endif`
`1116`	`1117`	`#if MYSQL_VERSION_ID >= 50711`
`1117`	`1118`	`{`
`1118`		`- mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_REQUIRED);`
	`1119`	`+ ssl_mode= SSL_MODE_REQUIRED;`
	`1120`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);`
`1119`	`1121`	`}`
`1120`	`1122`	`#endif`
`1121`	`1123`
`1122`	`1124`	`if (ssl_verify_cert && ssl_verify_cert == Py_True)`
`1123`	`1125`	`{`
`1124`	`1126`	`#if MYSQL_VERSION_ID >= 50711`
`1125`	`1127`	`{`
`1126`		`- mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_VERIFY_IDENTITY);`
	`1128`	`+ ssl_mode= SSL_MODE_VERIFY_IDENTITY;`
	`1129`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);`
`1127`	`1130`	`}`
`1128`	`1131`	`#else`
`1129`	`1132`	`{`
`@@ -1144,7 +1147,8 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1144`	`1147`	`#endif`
`1145`	`1148`	`#if MYSQL_VERSION_ID >= 50711`
`1146`	`1149`	`{`
`1147`		`- mysql_options(&self->session, MYSQL_OPT_SSL_ENFORCE, SSL_MODE_DISABLED);`
	`1150`	`+ ssl_mode= SSL_MODE_DISABLED;`
	`1151`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);`
`1148`	`1152`	`}`
`1149`	`1153`	`#endif`
`1150`	`1154`	`}`
`@@ -1170,6 +1174,11 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1170`	`1174`	`client_flags= client_flags & ~CLIENT_CONNECT_WITH_DB;`
`1171`	`1175`	`}`
`1172`	`1176`
	`1177`	`+ if (client_flags & CLIENT_LOCAL_FILES) {`
	`1178`	`+ abool= 1;`
	`1179`	`+ mysql_options(&self->session, MYSQL_OPT_LOCAL_INFILE, (unsigned int*)&abool);`
	`1180`	`+ }`
	`1181`	`+`
`1173`	`1182`	`res= mysql_real_connect(&self->session,`
`1174`	`1183`	`host, user, password, database,`
`1175`	`1184`	`port, unix_socket, client_flags);`