[CONJ-934] MariaDbDataSource is sensitive to the order of setting of …

…username and password
mariadb-corporation · Mar 3, 2022 · abc89b6 · abc89b6
1 parent 3d92551
commit abc89b6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbDataSource.java b/src/main/java/org/mariadb/jdbc/MariaDbDataSource.java
@@ -54,10 +54,13 @@ private void config() throws SQLException {
     if (url == null) throw new SQLException("url not set");
     conf = Configuration.parse(url);
     if (loginTimeout != null) conf.connectTimeout(loginTimeout * 1000);
-    if (user != null) {
+    if (user != null || password != null) {
       conf = conf.clone(user, password);
-    } else {
+    }
+    if (user != null) {
       user = conf.user();
+    }
+    if (password != null) {
       password = conf.password();
     }
   }

diff --git a/src/main/java/org/mariadb/jdbc/MariaDbPoolDataSource.java b/src/main/java/org/mariadb/jdbc/MariaDbPoolDataSource.java
@@ -50,12 +50,16 @@ private void config() throws SQLException {
     if (url == null) throw new SQLException("url not set");
     conf = Configuration.parse(url);
     if (loginTimeout != null) conf.connectTimeout(loginTimeout * 1000);
-    if (user != null) {
+    if (user != null || password != null) {
       conf = conf.clone(user, password);
-    } else {
+    }
+    if (user != null) {
       user = conf.user();
+    }
+    if (password != null) {
       password = conf.password();
     }
+
     pool = Pools.retrievePool(conf);
   }
 
@@ -268,15 +272,6 @@ public void setUser(String user) throws SQLException {
     if (conf != null) config();
   }
 
-  /**
-   * get password
-   *
-   * @return password
-   */
-  public String getPassword() {
-    return password;
-  }
-
   /**
    * set password
    *

diff --git a/src/test/java/org/mariadb/jdbc/integration/DataSourceTest.java b/src/test/java/org/mariadb/jdbc/integration/DataSourceTest.java
@@ -24,6 +24,11 @@ public void basic() throws SQLException {
     ds = new MariaDbDataSource();
     ds.setUrl(mDefUrl);
     testDs(ds);
+
+    ds = new MariaDbDataSource();
+    ds.setPassword("ttt");
+    ds.setUrl(mDefUrl);
+    assertThrows(SQLException.class, ds::getConnection);
   }
 
   private void testDs(MariaDbDataSource ds) throws SQLException {

diff --git a/src/test/java/org/mariadb/jdbc/integration/PoolDataSourceTest.java b/src/test/java/org/mariadb/jdbc/integration/PoolDataSourceTest.java
@@ -143,7 +143,6 @@ public void basic2() throws SQLException {
     MariaDbPoolDataSource ds = new MariaDbPoolDataSource();
     assertNull(ds.getUrl());
     assertNull(ds.getUser());
-    assertNull(ds.getPassword());
     assertEquals(30, ds.getLoginTimeout());
     DriverManager.setLoginTimeout(40);
     assertEquals(40, ds.getLoginTimeout());
@@ -162,7 +161,6 @@ public void basic2() throws SQLException {
     assertEquals("dd", ds.getUser());
 
     ds.setPassword("pwd");
-    assertEquals("pwd", ds.getPassword());
     assertThrows(SQLException.class, () -> ds.getConnection());
     assertThrows(SQLException.class, () -> ds.getPooledConnection());