BUG24948344 and BUG24948458: Fix parsing unix socket from the connection URI

amitab · amitab · commit d8ddc9b30d08 · 2016-10-29T16:25:07.000+05:30
This patch fixes parsing of socket from the Connection URI. The following
formats are tested and work correctly with this patch:

mysqlx://user:pass@(/path/to/sock)/schema
mysqlx://user:pass@/path%2Fto%2Fsock/schema
mysqlx://user:pass@.%2Fpath%2Fto%2Fsock/schema
mysqlx://user:pass@..%2Fpath%2Fto%2Fsock/schema

Tests have been added for regression.
diff --git a/lib/mysqlx/__init__.py b/lib/mysqlx/__init__.py
@@ -100,36 +100,31 @@ def _parse_connection_uri(uri):
         Returns a dict with parsed values of credentials and address of the
         MySQL server/farm.
     """
+    settings = {"schema": ""}
     uri = "{0}{1}".format("" if uri.startswith("mysqlx://")
                           else "mysqlx://", uri)
-    parsed = urlparse(uri)
-    if parsed.username is None or parsed.password is None:
+    scheme, temp = uri.split("://", 1)
+    userinfo, temp = temp.partition("@")[::2]
+    host, query_str = temp.partition("?")[::2]
+
+    pos = host.rfind("/")
+    if host[pos:].find(")") is -1 and pos > 0:
+        host, settings["schema"] = host.rsplit("/", 1)
+    host = host.strip("()")
+
+    if not host or not userinfo or ":" not in userinfo:
         raise InterfaceError("Malformed URI '{0}'".format(uri))
+    settings["user"], settings["password"] = userinfo.split(":", 1)
 
-    settings = {
-        "user": parsed.username,
-        "password": parsed.password
-    }
-
-    delimiter = ")" if ")" in parsed.path else "/"
-    socket, schema = parsed.path.rpartition(delimiter)[::2]
-    settings["schema"] = schema.lstrip("/")
-    if socket and parsed.hostname:
-        socket = "{0}{1}".format(parsed.hostname, socket).strip("()")
-
-    if socket.startswith(("/", ".", "..")):
-        settings["socket"] = unquote(socket).encode("utf-8")
-        return settings
-    elif socket.startswith("\\."):
+    if host.startswith(("/", "..", ".")):
+        settings["socket"] = unquote(host).encode("utf-8")
+    elif host.startswith("\\."):
         raise InterfaceError("Windows Pipe is not supported.")
-    elif parsed.hostname is None:
-        raise InterfaceError("Malformed URI '{0}'".format(uri))
+    else:
+        settings.update(_parse_address_list(host))
 
-    query = dict(parse_qsl(parsed.query, True))
-    for opt, val in query.items():
+    for opt, val in dict(parse_qsl(query_str, True)).items():
         settings[opt] = unquote(val.strip("()")) or True
-
-    settings.update(_parse_address_list(parsed.netloc.split("@")[-1]))
     return settings
 
 def _validate_settings(settings):
diff --git a/tests/test_mysqlx_connection.py b/tests/test_mysqlx_connection.py
@@ -173,6 +173,40 @@ def test_mysqlx_socket(self):
 
         session = mysqlx.get_session(uri)
 
+        conn = mysqlx._get_connection_settings("root:@(/path/to/sock)")
+        self.assertEqual("/path/to/sock", conn["socket"])
+        self.assertEqual("", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@(/path/to/sock)/schema")
+        self.assertEqual("/path/to/sock", conn["socket"])
+        self.assertEqual("schema", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@/path%2Fto%2Fsock")
+        self.assertEqual("/path/to/sock", conn["socket"])
+        self.assertEqual("", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@/path%2Fto%2Fsock/schema")
+        self.assertEqual("/path/to/sock", conn["socket"])
+        self.assertEqual("schema", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@.%2Fpath%2Fto%2Fsock")
+        self.assertEqual("./path/to/sock", conn["socket"])
+        self.assertEqual("", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@.%2Fpath%2Fto%2Fsock"
+                                               "/schema")
+        self.assertEqual("./path/to/sock", conn["socket"])
+        self.assertEqual("schema", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@..%2Fpath%2Fto%2Fsock")
+        self.assertEqual("../path/to/sock", conn["socket"])
+        self.assertEqual("", conn["schema"])
+
+        conn = mysqlx._get_connection_settings("root:@..%2Fpath%2Fto%2Fsock"
+                                               "/schema")
+        self.assertEqual("../path/to/sock", conn["socket"])
+        self.assertEqual("schema", conn["schema"])
+
 
     def test_connection_uri(self):
         uri = ("mysqlx://{user}:{password}@{host}:{port}/{schema}"
