Fix for Bug#113413 (Bug#36107426), Connection.changeUser cannot be done after DriverManager.loginTimeout elapses.

fjssilva · fjssilva · commit af0aa945ddd1 · 2025-11-14T19:01:37.000Z
Change-Id: I0ec337027dcfc5eab25cdb19917192ee1a4d2a29
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,9 @@
 
 Version 9.6.0
 
+  - Fix for Bug#113413 (Bug#36107426), Connection.changeUser cannot be done after DriverManager.loginTimeout elapses.
+    Thanks to Kazuhisa Kawashima for his contribution.
+
   - Fix for Bug#119271 (Bug#38599496), Connector/J fails to accept legacy value zeroDateTimeBehavior=convertToNull on multi-host URLs (failover).
 
   - Fix for Bug#119245 (Bug#38599240), Select into fix breaks queries with 'into' in them.
diff --git a/src/main/core-api/java/com/mysql/cj/protocol/Protocol.java b/src/main/core-api/java/com/mysql/cj/protocol/Protocol.java
@@ -104,8 +104,6 @@ public interface Protocol<M extends Message> {
 
     void afterHandshake();
 
-    void changeDatabase(String database);
-
     /**
      * Re-authenticates as the given user and password
      *
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/DebugBufferingPacketReader.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/DebugBufferingPacketReader.java
@@ -78,8 +78,8 @@ private NativePacketHeader readHeaderLocal(byte prevPacketSeq, NativePacketHeade
                 throw new IOException(Messages.getString("PacketReader.9", new Object[] { "-1", currPacketSeq }));
             }
 
-            if (currPacketSeq != -128 && prevPacketSeq != -1 && currPacketSeq != prevPacketSeq + 1) {
-                throw new IOException(Messages.getString("PacketReader.9", new Object[] { prevPacketSeq + 1, currPacketSeq }));
+            if (currPacketSeq != -128 && prevPacketSeq != -1 && (currPacketSeq < prevPacketSeq + 1 || currPacketSeq > prevPacketSeq + 2)) {
+                throw new IOException(Messages.getString("PacketReader.9", new Object[] { prevPacketSeq + 1, prevPacketSeq + 2, currPacketSeq }));
             }
 
         } else {
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
@@ -524,12 +524,6 @@ private void proceedHandshakeWithPluggableAuthentication(final NativePacketPaylo
             throw ExceptionFactory.createException(WrongArgumentException.class,
                     Messages.getString("CommunicationsException.TooManyAuthenticationPluginNegotiations"), getExceptionInterceptor());
         }
-
-        this.protocol.afterHandshake();
-
-        if (!this.useConnectWithDb) {
-            this.protocol.changeDatabase(this.database);
-        }
     }
 
     private String getNthFactorPassword(int nthFactor) {
@@ -653,9 +647,9 @@ private NativePacketPayload createChangeUserPacket(ServerSession serverSession,
         String enc = serverSession.getCharsetSettings().getPasswordCharacterEncoding();
 
         NativePacketPayload last_sent = new NativePacketPayload(AUTH_411_OVERHEAD + 7 //
-                + 48                // passwordLength
-                + 3 * this.username.length() // userLength
-                + (this.useConnectWithDb ? 3 * this.database.length() : 1)   // databaseLength
+                + 48                                                       // passwordLength
+                + 3 * this.username.length()                               // userLength
+                + (this.useConnectWithDb ? 3 * this.database.length() : 1) // databaseLength
                 + 1);
         last_sent.writeInteger(IntegerDataType.INT1, NativeConstants.COM_CHANGE_USER);
 
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java
@@ -527,8 +527,7 @@ public NativeServerSession getServerSession() {
         return this.serverSession;
     }
 
-    @Override
-    public void changeDatabase(String database) {
+    private void changeDatabase(String database) {
         if (database == null || database.length() == 0) {
             return;
         }
@@ -1280,10 +1279,13 @@ private void calculateSlowQueryThreshold() {
     @Override
     public void changeUser(String user, String password, String database) {
         this.packetSequence = -1;
-        this.packetSender = this.packetSender.undecorateAll();
-        this.packetReader = this.packetReader.undecorateAll();
+        this.packetReader.resetMessageSequence();
 
         this.authProvider.changeUser(user, password, database);
+
+        if (this.propertySet.getBooleanProperty(PropertyKey.createDatabaseIfNotExist).getValue()) {
+            changeDatabase(database);
+        }
     }
 
     protected boolean useNanosForElapsedTime() {
@@ -1330,6 +1332,12 @@ public void connect(String user, String password, String database) {
         beforeHandshake();
 
         this.authProvider.connect(user, password, database);
+
+        afterHandshake();
+
+        if (this.propertySet.getBooleanProperty(PropertyKey.createDatabaseIfNotExist).getValue()) {
+            changeDatabase(database);
+        }
     }
 
     protected boolean isDataAvailable() {
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/x/XProtocol.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/x/XProtocol.java
@@ -972,12 +972,6 @@ public ExceptionInterceptor getExceptionInterceptor() {
         throw ExceptionFactory.createException(CJOperationNotSupportedException.class, "Not supported");
     }
 
-    @Override
-    public void changeDatabase(String database) {
-        throw ExceptionFactory.createException(CJOperationNotSupportedException.class, "Not supported");
-        // TODO: Figure out how this is relevant for X Protocol client Session
-    }
-
     @Override
     public boolean versionMeetsMinimum(int major, int minor, int subminor) {
         //TODO: expose this via ServerVersion so calls look like x.getServerVersion().meetsMinimum(major, minor, subminor)
diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
@@ -361,7 +361,7 @@ PacketReader.5=reuseAndReadPacket() payload:\n
 PacketReader.6=readPacket() payload:\n
 PacketReader.7=\n\nLarge packet dump truncated at 
 PacketReader.8=\ bytes.
-PacketReader.9=Packets out of order, expected packet # {0}, but received packet # {1}
+PacketReader.9=Packets out of order, expected packet # {0} or # {1}, but received packet # {2}
 PacketReader.10=Packets received out of order
 
 PreparedQuery.0=SQL String cannot be NULL
diff --git a/src/test/java/testsuite/regression/ConnectionRegressionTest.java b/src/test/java/testsuite/regression/ConnectionRegressionTest.java
@@ -635,14 +635,14 @@ public void testBug7952() throws Exception {
                 assertTrue("08S01".equals(sqlEx.getSQLState()));
             }
 
-            ((com.mysql.cj.jdbc.JdbcConnection) failoverConnection).setFailedOver(true);
+            ((JdbcConnection) failoverConnection).setFailedOver(true);
 
             failoverConnection.setAutoCommit(true);
 
             String failedConnectionId = getSingleIndexedValueWithQuery(failoverConnection, 1, "SELECT CONNECTION_ID()").toString();
             System.out.println("Failed over connection id: " + failedConnectionId);
 
-            ((com.mysql.cj.jdbc.JdbcConnection) failoverConnection).setFailedOver(true);
+            ((JdbcConnection) failoverConnection).setFailedOver(true);
 
             for (int i = 0; i < 30; i++) {
                 failoverConnection.setAutoCommit(true);
@@ -689,13 +689,13 @@ public void testBug10144() throws Exception {
 
         Connection bareConn = getConnectionWithProps(props);
 
-        int currentOpenStatements = ((com.mysql.cj.jdbc.JdbcConnection) bareConn).getActiveStatementCount();
+        int currentOpenStatements = ((JdbcConnection) bareConn).getActiveStatementCount();
 
         try {
             bareConn.prepareStatement("Boo!");
             fail("Should not've been able to prepare that one!");
         } catch (SQLException sqlEx) {
-            assertEquals(currentOpenStatements, ((com.mysql.cj.jdbc.JdbcConnection) bareConn).getActiveStatementCount());
+            assertEquals(currentOpenStatements, ((JdbcConnection) bareConn).getActiveStatementCount());
         } finally {
             bareConn.close();
         }
@@ -2251,14 +2251,14 @@ public void testBug48442() throws Exception {
     public void testBug45171() throws Exception {
         List<Statement> statementsToTest = new LinkedList<>();
         statementsToTest.add(this.conn.createStatement());
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).clientPrepareStatement("SELECT 1"));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).clientPrepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).clientPrepareStatement("SELECT 1", new int[0]));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).clientPrepareStatement("SELECT 1", new String[0]));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).serverPrepareStatement("SELECT 1"));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).serverPrepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).serverPrepareStatement("SELECT 1", new int[0]));
-        statementsToTest.add(((com.mysql.cj.jdbc.JdbcConnection) this.conn).serverPrepareStatement("SELECT 1", new String[0]));
+        statementsToTest.add(((JdbcConnection) this.conn).clientPrepareStatement("SELECT 1"));
+        statementsToTest.add(((JdbcConnection) this.conn).clientPrepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS));
+        statementsToTest.add(((JdbcConnection) this.conn).clientPrepareStatement("SELECT 1", new int[0]));
+        statementsToTest.add(((JdbcConnection) this.conn).clientPrepareStatement("SELECT 1", new String[0]));
+        statementsToTest.add(((JdbcConnection) this.conn).serverPrepareStatement("SELECT 1"));
+        statementsToTest.add(((JdbcConnection) this.conn).serverPrepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS));
+        statementsToTest.add(((JdbcConnection) this.conn).serverPrepareStatement("SELECT 1", new int[0]));
+        statementsToTest.add(((JdbcConnection) this.conn).serverPrepareStatement("SELECT 1", new String[0]));
 
         for (Statement toTest : statementsToTest) {
             assertEquals(toTest.getResultSetType(), ResultSet.TYPE_FORWARD_ONLY);
@@ -2550,7 +2550,7 @@ public void testBug49700() throws Exception {
         props.setProperty(PropertyKey.sessionVariables.getKeyName(), "@foo='bar'");
         Connection c = getConnectionWithProps(props);
         assertEquals("bar", getSingleIndexedValueWithQuery(c, 1, "SELECT @foo"));
-        ((com.mysql.cj.jdbc.JdbcConnection) c).resetServerState();
+        ((JdbcConnection) c).resetServerState();
         assertEquals("bar", getSingleIndexedValueWithQuery(c, 1, "SELECT @foo"));
     }
 
@@ -2930,7 +2930,7 @@ public void testStatementComment() throws Exception {
             PrintStream printStream = new PrintStream(bOut);
             System.setErr(printStream);
 
-            ((com.mysql.cj.jdbc.JdbcConnection) c).setStatementComment("Hi there");
+            ((JdbcConnection) c).setStatementComment("Hi there");
             c.setAutoCommit(false);
 
             c.createStatement().execute("SELECT 1");
@@ -3004,12 +3004,11 @@ public void testChangeUser() throws Exception {
         Statement testStmt = testConn.createStatement();
 
         for (int i = 0; i < 500; i++) {
-            ((com.mysql.cj.jdbc.JdbcConnection) testConn).changeUser(props.getProperty(PropertyKey.USER.getKeyName()),
-                    props.getProperty(PropertyKey.PASSWORD.getKeyName()));
+            ((JdbcConnection) testConn).changeUser(props.getProperty(PropertyKey.USER.getKeyName()), props.getProperty(PropertyKey.PASSWORD.getKeyName()));
 
             if (i % 10 == 0) {
                 try {
-                    ((com.mysql.cj.jdbc.JdbcConnection) testConn).changeUser("bubba", props.getProperty(PropertyKey.PASSWORD.getKeyName()));
+                    ((JdbcConnection) testConn).changeUser("bubba", props.getProperty(PropertyKey.PASSWORD.getKeyName()));
                 } catch (SQLException sqlEx) {
                     sqlEx.printStackTrace();
                     assertTrue(testConn.isClosed());
@@ -3037,14 +3036,13 @@ public void testChangeUserNoDb() throws Exception {
 
             Connection con = getConnectionWithProps(props);
 
-            this.rs = this.stmt.executeQuery("show databases like '" + databaseName + "'");
+            this.rs = this.stmt.executeQuery("SHOW DATABASES LIKE '" + databaseName + "'");
             assertTrue(this.rs.next(), "Database " + databaseName + " is not found.");
             assertEquals(databaseName, this.rs.getString(1));
 
-            ((com.mysql.cj.jdbc.JdbcConnection) con).changeUser(props.getProperty(PropertyKey.USER.getKeyName()),
-                    props.getProperty(PropertyKey.PASSWORD.getKeyName()));
+            ((JdbcConnection) con).changeUser(props.getProperty(PropertyKey.USER.getKeyName()), props.getProperty(PropertyKey.PASSWORD.getKeyName()));
 
-            this.rs = con.createStatement().executeQuery("select DATABASE()");
+            this.rs = con.createStatement().executeQuery("SELECT DATABASE()");
             assertTrue(this.rs.next());
             assertEquals(databaseName, this.rs.getString(1));
 
@@ -3063,8 +3061,7 @@ public void testChangeUserClosedConn() throws Exception {
 
         try {
             newConn.close();
-            ((com.mysql.cj.jdbc.JdbcConnection) newConn).changeUser(props.getProperty(PropertyKey.USER.getKeyName()),
-                    props.getProperty(PropertyKey.PASSWORD.getKeyName()));
+            ((JdbcConnection) newConn).changeUser(props.getProperty(PropertyKey.USER.getKeyName()), props.getProperty(PropertyKey.PASSWORD.getKeyName()));
             fail("Expected SQL Exception");
         } catch (SQLException ex) {
             // expected
@@ -3103,7 +3100,7 @@ public void testBug63284() throws Exception {
 
             failoverConnection2 = getConnectionWithProps("jdbc:mysql://source:" + port + ",replica:" + port + "/", props);
 
-            assertTrue(((com.mysql.cj.jdbc.JdbcConnection) failoverConnection1).isSourceConnection());
+            assertTrue(((JdbcConnection) failoverConnection1).isSourceConnection());
 
             // Two different Connection objects should not equal each other:
             assertFalse(failoverConnection1.equals(failoverConnection2));
@@ -3120,7 +3117,7 @@ public void testBug63284() throws Exception {
                 }
             }
             // ensure we're now connected to the replica
-            assertFalse(((com.mysql.cj.jdbc.JdbcConnection) failoverConnection1).isSourceConnection());
+            assertFalse(((JdbcConnection) failoverConnection1).isSourceConnection());
 
             // ensure that hashCode() result is persistent across failover events when proxy state changes
             assertEquals(hc, failoverConnection1.hashCode());
@@ -4896,7 +4893,7 @@ private void testMemLeakBatch(Properties props, Set<?> connectionTrackingSet, Fi
             if (finType == 1) {
                 connection.close();
             } else if (finType == 2) {
-                ((com.mysql.cj.jdbc.JdbcConnection) connection).abortInternal();
+                ((JdbcConnection) connection).abortInternal();
             }
             connection = null;
         }
@@ -4925,7 +4922,7 @@ private void testMemLeakBatch(Properties props, Set<?> connectionTrackingSet, Fi
     private int countTestConnections(Set<?> connectionTrackingSet, Field referentField, boolean show, String attributValue) throws Exception {
         int connectionNumber = 0;
         for (Object o1 : connectionTrackingSet) {
-            com.mysql.cj.jdbc.JdbcConnection ctmp = (com.mysql.cj.jdbc.JdbcConnection) referentField.get(o1);
+            JdbcConnection ctmp = (JdbcConnection) referentField.get(o1);
             String atts = null;
             try {
                 if (ctmp != null) {
@@ -5259,7 +5256,7 @@ public void testBug69452() throws Exception {
                 props.setProperty(PropertyKey.blobSendChunkSize.getKeyName(), String.format("1.2%1$s", testMemUnits[i][j]));
                 props.setProperty(PropertyKey.largeRowSizeThreshold.getKeyName(), String.format("1.4%1$s", testMemUnits[i][j]));
                 props.setProperty(PropertyKey.locatorFetchBufferSize.getKeyName(), String.format("1.6%1$s", testMemUnits[i][j]));
-                connWithMemProps = (com.mysql.cj.jdbc.JdbcConnection) getConnectionWithProps(props);
+                connWithMemProps = (JdbcConnection) getConnectionWithProps(props);
 
                 // test values of property 'blobSendChunkSize'
                 assertEquals((int) (memMultiplier[i] * 1.2),
@@ -12635,4 +12632,34 @@ void testBug119271() throws Exception {
         assertDoesNotThrow(() -> getSourceReplicaReplicationConnection(props).close());
     }
 
+    /**
+     * Tests fix for Bug#113413 (Bug#36107426), Connection.changeUser cannot be done after DriverManager.loginTimeout elapses.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testBug113413() throws Exception {
+        Properties props = getPropertiesFromTestsuiteUrl();
+        String username = props.getProperty(PropertyKey.USER.getKeyName());
+        String password = props.getProperty(PropertyKey.PASSWORD.getKeyName());
+
+        int originalLoginTimeout = DriverManager.getLoginTimeout();
+        DriverManager.setLoginTimeout(3);
+        try (Connection testConn = getNewConnection()) {
+            Statement testStmt = testConn.createStatement();
+
+            testConn.unwrap(JdbcConnection.class).changeUser(username, password);
+            this.rs = testStmt.executeQuery("SELECT 1");
+            assertTrue(this.rs.next());
+
+            TimeUnit.MILLISECONDS.sleep(3001);
+
+            testConn.unwrap(JdbcConnection.class).changeUser(username, password);
+            this.rs = testStmt.executeQuery("SELECT 1");
+            assertTrue(this.rs.next());
+        } finally {
+            DriverManager.setLoginTimeout(originalLoginTimeout);
+        }
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,6 @@ public interface Protocol<M extends Message> {`
`104`	`104`
`105`	`105`	`void afterHandshake();`
`106`	`106`
`107`		`- void changeDatabase(String database);`
`108`		`-`
`109`	`107`	`/**`
`110`	`108`	`* Re-authenticates as the given user and password`
`111`	`109`	`*`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ private NativePacketHeader readHeaderLocal(byte prevPacketSeq, NativePacketHeade`
`78`	`78`	`throw new IOException(Messages.getString("PacketReader.9", new Object[] { "-1", currPacketSeq }));`
`79`	`79`	`}`
`80`	`80`
`81`		`- if (currPacketSeq != -128 && prevPacketSeq != -1 && currPacketSeq != prevPacketSeq + 1) {`
`82`		`- throw new IOException(Messages.getString("PacketReader.9", new Object[] { prevPacketSeq + 1, currPacketSeq }));`
	`81`	`+ if (currPacketSeq != -128 && prevPacketSeq != -1 && (currPacketSeq < prevPacketSeq + 1 \|\| currPacketSeq > prevPacketSeq + 2)) {`
	`82`	`+ throw new IOException(Messages.getString("PacketReader.9", new Object[] { prevPacketSeq + 1, prevPacketSeq + 2, currPacketSeq }));`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`} else {`