From 515c05c873f17e5ce6097f3a348fb5b3af98cb52 Mon Sep 17 00:00:00 2001 From: "jianghang.loujh" Date: Tue, 24 Dec 2024 16:39:21 +0800 Subject: [PATCH] fixed issue #5301, fixed caching_sha2_password full auth --- .../otter/canal/parse/driver/mysql/MysqlConnector.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java b/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java index c54ba327..0ef9d0e2 100644 --- a/driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java +++ b/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 {