Browse Source

fixed issue #5301, fixed caching_sha2_password full auth

jianghang.loujh 4 months ago
parent
commit
515c05c873

+ 1 - 4
driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java

@@ -228,7 +228,7 @@ public class MysqlConnector {
         if (handshakePacket.authPluginName != null && handshakePacket.authPluginName.length > 0) {
             authPluginName = new String(handshakePacket.authPluginName);
         }
-        logger.info("auth ClientAuthenticationSHA2Packet: {}", authPluginName);
+        logger.info("auth plugin: {}", authPluginName);
         boolean isSha2Password = false;
         ClientAuthenticationPacket clientAuth;
         if ("caching_sha2_password".equals(authPluginName)) {
@@ -316,9 +316,6 @@ public class MysqlConnector {
                             // fixed issue https://github.com/alibaba/canal/pull/4767, support mysql 8.0.30+
                             header = cachingSha2PasswordFullAuth(channel, header, getPassword().getBytes(), scramble);
                             body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
-                        } else {
-                            header = PacketManager.readHeader(channel, 4);
-                            body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
                         }
                     }
                 } else {