CDRIVER-2158 preserve case of domain socket paths

Author: ajdavis

NEWS

@@ -30,6 +30,7 @@ Next Release
     * Special characters in username, password and other values must be url encoded
     * Unsupported connection string options now issue warnings
     * Boolean values can now be represented as true/yes/y/t/1 and false/no/n/f/0.
+    * Case is now preserved in Unix domain paths.
   * New function mongoc_cursor_error_document provides access to server's error
     reply if a query or command fails.
   * mongoc_gridfs_find_one_with_opts optimized to use limit 1.

src/mongoc/mongoc-uri-private.h

@@ -30,7 +30,7 @@ BSON_BEGIN_DECLS
 bool
 mongoc_uri_append_host (mongoc_uri_t *uri, const char *host, uint16_t port);
 bool
-mongoc_uri_parse_host (mongoc_uri_t *uri, const char *str);
+mongoc_uri_parse_host (mongoc_uri_t *uri, const char *str, bool downcase);
 
 int32_t
 mongoc_uri_get_local_threshold_option (const mongoc_uri_t *uri);

src/mongoc/mongoc-uri.c

@@ -86,7 +86,7 @@ mongoc_uri_append_host (mongoc_uri_t *uri, const char *host, uint16_t port)
    }
 
    link_ = (mongoc_host_list_t *) bson_malloc0 (sizeof *link_);
-   mongoc_lowercase (host, link_->host);
+   bson_strncpy (link_->host, host, sizeof link_->host);
    if (strchr (host, ':')) {
       bson_snprintf (link_->host_and_port,
                      sizeof link_->host_and_port,
@@ -262,6 +262,7 @@ mongoc_uri_parse_host6 (mongoc_uri_t *uri, const char *str)
       return false;
    }
 
+   mongoc_lowercase (hostname, hostname);
    r = mongoc_uri_append_host (uri, hostname, port);
    bson_free (hostname);
 
@@ -270,7 +271,7 @@ mongoc_uri_parse_host6 (mongoc_uri_t *uri, const char *str)
 
 
 bool
-mongoc_uri_parse_host (mongoc_uri_t *uri, const char *str)
+mongoc_uri_parse_host (mongoc_uri_t *uri, const char *str, bool downcase)
 {
    uint16_t port;
    const char *end_host;
@@ -310,6 +311,10 @@ mongoc_uri_parse_host (mongoc_uri_t *uri, const char *str)
       return false;
    }
 
+   if (downcase) {
+      mongoc_lowercase (hostname, hostname);
+   }
+
    r = mongoc_uri_append_host (uri, hostname, port);
    bson_free (hostname);
 
@@ -341,11 +346,11 @@ mongoc_uri_parse_hosts (mongoc_uri_t *uri, const char *str, const char **end)
  */
 
 again:
-   if (((*str == '/') && (sock = strstr (str, ".sock"))) &&
+   if (((!strncmp (str, "%2F", 3)) && (sock = strstr (str, ".sock"))) &&
        (!(tmp = strstr (str, ",")) || (tmp > sock)) &&
        (!(tmp = strstr (str, "?")) || (tmp > sock))) {
       s = bson_strndup (str, sock + 5 - str);
-      if (!mongoc_uri_parse_host (uri, s)) {
+      if (!mongoc_uri_parse_host (uri, s, false /* downcase */)) {
          bson_free (s);
          return false;
       }
@@ -358,7 +363,7 @@ mongoc_uri_parse_hosts (mongoc_uri_t *uri, const char *str, const char **end)
       }
       *end = str;
    } else if ((s = scan_to_unichar (str, ',', "/", &end_hostport))) {
-      if (!mongoc_uri_parse_host (uri, s)) {
+      if (!mongoc_uri_parse_host (uri, s, true /* downcase */)) {
          bson_free (s);
          return false;
       }
@@ -368,15 +373,15 @@ mongoc_uri_parse_hosts (mongoc_uri_t *uri, const char *str, const char **end)
       goto again;
    } else if ((s = scan_to_unichar (str, '/', "", &end_hostport)) ||
               (s = scan_to_unichar (str, '?', "", &end_hostport))) {
-      if (!mongoc_uri_parse_host (uri, s)) {
+      if (!mongoc_uri_parse_host (uri, s, true /* downcase */)) {
          bson_free (s);
          return false;
       }
       bson_free (s);
       *end = end_hostport;
       return true;
    } else if (*str) {
-      if (!mongoc_uri_parse_host (uri, str)) {
+      if (!mongoc_uri_parse_host (uri, str, true /* downcase */)) {
          return false;
       }
       *end = str + strlen (str);

tests/test-mongoc-uri.c

@@ -679,6 +679,13 @@ test_mongoc_uri_functions (void)
    mongoc_database_destroy (db);
    mongoc_client_destroy (client);
    mongoc_uri_destroy (uri);
+
+   uri = mongoc_uri_new ("mongodb://%2Ftmp%2FMongoDB-27017.sock/");
+   ASSERT_CMPSTR (mongoc_uri_get_hosts (uri)->host, "/tmp/MongoDB-27017.sock");
+   ASSERT_CMPSTR (mongoc_uri_get_hosts (uri)->host_and_port,
+                  "/tmp/MongoDB-27017.sock");
+
+   mongoc_uri_destroy (uri);
 }
 
 static void
@@ -812,7 +819,7 @@ test_mongoc_host_list_from_string (void)
 
    ASSERT (_mongoc_host_list_from_string (&host_list, "[::1]"));
    ASSERT_CMPSTR (host_list.host_and_port, "[::1]:27017");
-   ASSERT_CMPSTR (host_list.host, "::1");  /* no "[" or "]" */
+   ASSERT_CMPSTR (host_list.host, "::1"); /* no "[" or "]" */
    ASSERT (host_list.port == 27017);
 
    ASSERT (_mongoc_host_list_from_string (&host_list, "[Fe80::1]:1234"));