Fixes #1136 sanitize jdbcUrl for logging.

brettwooldridge · Apr 18, 2018 · 95e0b42 · 95e0b42
1 parent b363232
commit 95e0b42
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
@@ -98,17 +98,18 @@ public DriverDataSource(String jdbcUrl, String driverClassName, Properties prope
          }
       }
 
+      final String sanitizedUrl = jdbcUrl.replaceAll("([?&;]password=)[^&#;]*(.*)", "$1<masked>$2");
       try {
          if (driver == null) {
             driver = DriverManager.getDriver(jdbcUrl);
-            LOGGER.debug("Loaded driver with class name {} for jdbcUrl={}", driver.getClass().getName(), jdbcUrl);
+            LOGGER.debug("Loaded driver with class name {} for jdbcUrl={}", driver.getClass().getName(), sanitizedUrl);
          }
          else if (!driver.acceptsURL(jdbcUrl)) {
-            throw new RuntimeException("Driver " + driverClassName + " claims to not accept jdbcUrl, " + jdbcUrl);
+            throw new RuntimeException("Driver " + driverClassName + " claims to not accept jdbcUrl, " + sanitizedUrl);
          }
       }
       catch (SQLException e) {
-         throw new RuntimeException("Failed to get driver instance for jdbcUrl=" + jdbcUrl, e);
+         throw new RuntimeException("Failed to get driver instance for jdbcUrl=" + sanitizedUrl, e);
       }
    }