chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue #5301, fixed caching_sha2_password full auth & client SHA2

Browse Source
This commit is contained in:
jianghang.loujh
2024-12-24 17:51:31 +08:00
parent 515c05c873
commit 2d0dcf0e5d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java
View File

@@ -255,9 +255,7 @@ public class MysqlConnector {
logger.info("client authentication packet is sent out."); logger.info("client authentication packet is sent out.");
// check auth result // check auth result
header = null;
header = PacketManager.readHeader(channel, 4); header = PacketManager.readHeader(channel, 4);
body = null;
body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout); body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
assert body != null; assert body != null;
byte marker = body[0]; byte marker = body[0];
@@ -269,7 +267,7 @@ public class MysqlConnector {
body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout); body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
} else { } else {
byte[] authData = null; byte[] authData = null;
String pluginName = null; String pluginName = authPluginName;
if (marker == 1) { if (marker == 1) {
AuthSwitchRequestMoreData packet = new AuthSwitchRequestMoreData(); AuthSwitchRequestMoreData packet = new AuthSwitchRequestMoreData();
packet.fromBytes(body); packet.fromBytes(body);
@@ -296,13 +294,16 @@ public class MysqlConnector {
header = authSwitchAfterAuth(encryptedPassword, header); header = authSwitchAfterAuth(encryptedPassword, header);
body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout); body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
} else if ("caching_sha2_password".equals(pluginName)) { } else if ("caching_sha2_password".equals(pluginName)) {
byte[] scramble = authData;
if (body[0] == 0x01 && body[1] == 0x04) { if (body[0] == 0x01 && body[1] == 0x04) {
// support full auth // support full auth
// clientAuth提前采用了sha2编码,会减少一次auth交互 // clientAuth提前采用了sha2编码,会减少一次auth交互
header = cachingSha2PasswordFullAuth(channel, header, getPassword().getBytes(), scramble); header = cachingSha2PasswordFullAuth(channel,
header,
getPassword().getBytes(),
clientAuth.getScrumbleBuff());
body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout); body = PacketManager.readBytes(channel, header.getPacketBodyLength(), timeout);
} else { } else {
byte[] scramble = authData;
try { try {
encryptedPassword = MySQLPasswordEncrypter.scrambleCachingSha2(getPassword().getBytes(), encryptedPassword = MySQLPasswordEncrypter.scrambleCachingSha2(getPassword().getBytes(),
scramble); scramble);
@@ -353,9 +354,9 @@ public class MysqlConnector {
if (packet.status != 0x01) { if (packet.status != 0x01) {
throw new IOException("caching_sha2_password get public key failed"); throw new IOException("caching_sha2_password get public key failed");
} }
logger.info("caching sha2 password fullAuth get server public key succeed."); logger.info("caching sha2 password fullAuth get server public key succeed.");
byte[] publicKeyBytes = packet.authData; byte[] publicKeyBytes = packet.authData;
byte[] encryptedPassword = null; byte[] encryptedPassword = null;
try { try {
encryptedPassword = MySQLPasswordEncrypter.scrambleRsa(publicKeyBytes, pass, seed); encryptedPassword = MySQLPasswordEncrypter.scrambleRsa(publicKeyBytes, pass, seed);