Check URL scheme

h2database · Jan 4, 2022 · b24aa46 · b24aa46
1 parent 4a2e677
commit b24aa46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/h2/src/main/org/h2/util/JdbcUtils.java b/h2/src/main/org/h2/util/JdbcUtils.java
@@ -315,6 +315,9 @@ public static Connection getConnection(String driver, String url, String user, S
                     }
                     throw new SQLException("Driver " + driver + " is not suitable for " + url, "08001");
                 } else if (javax.naming.Context.class.isAssignableFrom(d)) {
+                    if (!url.startsWith("java:")) {
+                        throw new SQLException("Only java scheme is supported for JNDI lookups", "08001");
+                    }
                     // JNDI context
                     Context context = (Context) d.getDeclaredConstructor().newInstance();
                     DataSource ds = (DataSource) context.lookup(url);

diff --git a/h2/src/test/org/h2/test/unit/TestTools.java b/h2/src/test/org/h2/test/unit/TestTools.java
@@ -531,6 +531,13 @@ private void testJdbcDriverUtils() {
         } catch (SQLException e) {
             assertEquals("08001", e.getSQLState());
         }
+        try {
+            JdbcUtils.getConnection("javax.naming.InitialContext", "ldap://localhost/ds", "sa", "");
+            fail("Expected SQLException: 08001");
+        } catch (SQLException e) {
+            assertEquals("08001", e.getSQLState());
+            assertEquals("Only java scheme is supported for JNDI lookups", e.getMessage());
+        }
     }
 
     private void testWrongServer() throws Exception {