Forward slash in connection string is optional

JAVA-5166

Author: jyemin

driver-core/src/main/com/mongodb/ConnectionString.java

@@ -368,24 +368,27 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
 
         // Split out the user and host information
         String userAndHostInformation;
-        int idx = unprocessedConnectionString.indexOf("/");
-        if (idx == -1) {
-            if (unprocessedConnectionString.contains("?")) {
-                throw new IllegalArgumentException("The connection string contains options without trailing slash");
+        int firstForwardSlashIdx = unprocessedConnectionString.indexOf("/");
+        int firstQuestionMarkIdx = unprocessedConnectionString.indexOf("?");
+        if (firstForwardSlashIdx == -1 || (firstQuestionMarkIdx != -1 && firstQuestionMarkIdx < firstForwardSlashIdx)) {
+            if (firstQuestionMarkIdx == -1) {
+                userAndHostInformation = unprocessedConnectionString;
+                unprocessedConnectionString = "";
+            } else {
+                userAndHostInformation = unprocessedConnectionString.substring(0, firstQuestionMarkIdx);
+                unprocessedConnectionString = unprocessedConnectionString.substring(firstQuestionMarkIdx);
             }
-            userAndHostInformation = unprocessedConnectionString;
-            unprocessedConnectionString = "";
         } else {
-            userAndHostInformation = unprocessedConnectionString.substring(0, idx);
-            unprocessedConnectionString = unprocessedConnectionString.substring(idx + 1);
+            userAndHostInformation = unprocessedConnectionString.substring(0, firstForwardSlashIdx);
+            unprocessedConnectionString = unprocessedConnectionString.substring(firstForwardSlashIdx + 1);
         }
 
         // Split the user and host information
         String userInfo;
         String hostIdentifier;
         String userName = null;
         char[] password = null;
-        idx = userAndHostInformation.lastIndexOf("@");
+        int idx = userAndHostInformation.lastIndexOf("@");
         if (idx > 0) {
             userInfo = userAndHostInformation.substring(0, idx).replace("+", "%2B");
             hostIdentifier = userAndHostInformation.substring(idx + 1);

driver-core/src/test/resources/connection-string/invalid-uris.json

@@ -162,15 +162,6 @@
       "auth": null,
       "options": null
     },
-    {
-      "description": "Missing delimiting slash between hosts and options",
-      "uri": "mongodb://example.com?w=1",
-      "valid": false,
-      "warning": null,
-      "hosts": null,
-      "auth": null,
-      "options": null
-    },
     {
       "description": "Incomplete key value pair for option",
       "uri": "mongodb://example.com/?w",
@@ -269,6 +260,24 @@
       "hosts": null,
       "auth": null,
       "options": null
+    },
+    {
+      "description": "Username with password containing an unescaped percent sign and an escaped one",
+      "uri": "mongodb://user%20%:password@localhost",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username with password containing an unescaped percent sign (non hex digit)",
+      "uri": "mongodb://user%w:password@localhost",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
     }
   ]
 }

driver-core/src/test/resources/connection-string/valid-options.json

@@ -21,9 +21,26 @@
         "authmechanism": "MONGODB-CR"
       }
     },
+    {
+      "description": "Missing delimiting slash between hosts and options",
+      "uri": "mongodb://example.com?tls=true",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": {
+        "tls": true
+      }
+    },
     {
       "description": "Colon in a key value pair",
-      "uri": "mongodb://example.com/?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://test-cluster",
+      "uri": "mongodb://example.com?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://test-cluster",
       "valid": true,
       "warning": false,
       "hosts": [

driver-core/src/test/unit/com/mongodb/AbstractConnectionStringTest.java

@@ -100,7 +100,7 @@ protected void testValidOptions() {
         ConnectionString connectionString = null;
 
         try {
-            connectionString = new ConnectionString(input);
+        connectionString = new ConnectionString(input);
         } catch (Throwable t) {
             fail(String.format("Connection string '%s' should not have thrown an exception: %s", input, t));
         }

driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy

@@ -141,6 +141,29 @@ class ConnectionStringSpecification extends Specification {
                 .withWTimeout(5, MILLISECONDS).withJournal(true)
     }
 
+    @Unroll
+    def 'should treat trailing slash before query parameters as optional'() {
+        expect:
+        uri.getApplicationName() == appName
+        uri.getDatabase() == db
+
+        where:
+        uri                                                              | appName | db
+        new ConnectionString('mongodb://mongodb.com')                    | null    | null
+        new ConnectionString('mongodb://mongodb.com?')                   | null    | null
+        new ConnectionString('mongodb://mongodb.com/')                   | null    | null
+        new ConnectionString('mongodb://mongodb.com/?')                  | null    | null
+        new ConnectionString('mongodb://mongodb.com/test')               | null    | "test"
+        new ConnectionString('mongodb://mongodb.com/test?')              | null    | "test"
+        new ConnectionString('mongodb://mongodb.com/?appName=a1')        | "a1"    | null
+        new ConnectionString('mongodb://mongodb.com?appName=a1')         | "a1"    | null
+        new ConnectionString('mongodb://mongodb.com/?appName=a1/a2')     | "a1/a2" | null
+        new ConnectionString('mongodb://mongodb.com?appName=a1/a2')      | "a1/a2" | null
+        new ConnectionString('mongodb://mongodb.com/test?appName=a1/a2') | "a1/a2" | "test"
+        new ConnectionString('mongodb://mongodb.com/test?appName=a1')    | "a1"    | "test"
+        new ConnectionString('mongodb://mongodb.com/test?appName=a1/a2') | "a1/a2" | "test"
+    }
+
     def 'should correctly parse different UUID representations'() {
         expect:
         uri.getUuidRepresentation() == uuidRepresentation
@@ -473,7 +496,6 @@ class ConnectionStringSpecification extends Specification {
         'has an empty host'                             | 'mongodb://localhost:27017,,localhost:27019'
         'has an malformed IPv6 host'                    | 'mongodb://[::1'
         'has unescaped colons'                          | 'mongodb://locahost::1'
-        'is missing a slash'                            | 'mongodb://localhost?wTimeout=5'
         'contains an invalid port string'               | 'mongodb://localhost:twenty'
         'contains an invalid port negative'             | 'mongodb://localhost:-1'
         'contains an invalid port out of range'         | 'mongodb://localhost:1000000'

driver-legacy/src/test/unit/com/mongodb/MongoClientURISpecification.groovy

@@ -34,14 +34,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS
 
 class MongoClientURISpecification extends Specification {
 
-    def 'should throw Exception if URI does not have a trailing slash'() {
-        when:
-        new MongoClientURI('mongodb://localhost?wtimeoutMS=5')
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
     def 'should not throw an Exception if URI contains an unknown option'() {
         when:
         new MongoClientURI('mongodb://localhost/?unknownOption=5')