extra tests

Author: pjfanning

jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java

@@ -596,7 +596,8 @@ public Connection getConnection(InterpreterContext context)
     return connection;
   }
 
-  private void validateConnectionUrl(String url) {
+  // package private for testing purposes
+  static void validateConnectionUrl(String url) {
     final String decodedUrl = urlDecode(url, url, 0);
     final Map<String, String> params = parseUrlParameters(decodedUrl);
 
@@ -655,7 +656,7 @@ private static Map<String, String> parseUrlParameters(final String url) {
     if (parts.length > 1) {
       // The first part is the base URL, so we start from the second part
       for (int i = 1; i < parts.length; i++) {
-        splitNameValue(parts[i], parameters);
+        splitNameValue(parts[i], parameters, true);
       }
     }
     return parameters;
@@ -691,7 +692,7 @@ private static int extractFromParens(final String input,
       String params = input.substring(startIndex + 1, endIndex);
       String[] keyValuePairs = params.split(",");
       for (String pair : keyValuePairs) {
-        splitNameValue(pair, parameters);
+        splitNameValue(pair, parameters, false);
       }
     }
     return endIndex;
@@ -703,12 +704,14 @@ private static int extractFromParens(final String input,
    *
    * @param nameValue the name-value pair as a string
    * @param parameters the map to store the extracted key-value pair
+   * @param allowEmptyValue whether to allow empty values
    */
-  private static void splitNameValue(String nameValue, Map<String, String> parameters) {
+  private static void splitNameValue(String nameValue, Map<String, String> parameters,
+                                     boolean allowEmptyValue) {
     String[] keyValue = nameValue.split("=");
     if (keyValue.length >= 2) {
       parameters.put(keyValue[0].trim(), keyValue[1].trim());
-    } else {
+    } else if (allowEmptyValue) {
       // Handle cases where there might not be a value
       parameters.put(keyValue[0].trim(), "");
     }

jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java

@@ -58,11 +58,7 @@
 import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_URL;
 import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_USER;
 import static org.apache.zeppelin.jdbc.JDBCInterpreter.PRECODE_KEY_TEMPLATE;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 /**
@@ -784,11 +780,24 @@ void testValidateConnectionMySQLProps() throws IOException, InterpreterException
 
   @Test
   void testValidateConnectionMySQLProps2() throws IOException, InterpreterException {
+    testBannedURL("com.mysql.cj.jdbc.Driver",
+        "jdbc:mysql://[(host=myhost,port=1111,allowLoadLocalInfile=true),(host=myhost2)]/db");
+  }
+
+  @Test
+  void testValidateConnectionMySQLProps3() throws IOException, InterpreterException {
     testBannedURL("com.mysql.cj.jdbc.Driver",
         "jdbc:mysql://address=(host=172.18.0.1)(port=3309)" +
             "(%2561llowLoadLocalInfile=true),localhost:3306/test");
   }
 
+  @Test
+  void testValidateConnectionMySQLWeirdPassword() throws IOException, InterpreterException {
+    // we strongly discourage putting passwords in the URL
+    assertDoesNotThrow(() -> JDBCInterpreter.validateConnectionUrl
+        ("jdbc:mysql://localhost:3306/test?user=xyz&password=(allowLoadLocalInfile)"));
+  }
+
   private void testBannedH2QueryParam(String param) throws IOException, InterpreterException {
     testBannedURL("org.h2.Driver", getJdbcConnection() + ";" + param);
   }