From 67e0928d805bf05373ba5f79f3d7b5fbe9bfc344 Mon Sep 17 00:00:00 2001 From: "jianghang.loujh" Date: Fri, 22 Dec 2023 10:29:38 +0800 Subject: [PATCH] fixed security bugfix #4941 , process auth failed --- deployer/src/main/resources/canal_local.properties | 4 ++-- .../server/netty/handler/ClientAuthenticationHandler.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deployer/src/main/resources/canal_local.properties b/deployer/src/main/resources/canal_local.properties index f92b8f3c..be9d0d66 100644 --- a/deployer/src/main/resources/canal_local.properties +++ b/deployer/src/main/resources/canal_local.properties @@ -5,8 +5,8 @@ canal.register.ip = canal.admin.manager = 127.0.0.1:8089 canal.admin.port = 11110 canal.admin.user = admin -canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441 +canal.admin.passwd = # admin auto register canal.admin.register.auto = true canal.admin.register.cluster = -canal.admin.register.name = \ No newline at end of file +canal.admin.register.name = diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java index d299956d..1127b5e1 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java @@ -56,12 +56,14 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { byte[] errorBytes = NettyUtils.errorPacket(400, MessageFormatter.format("auth failed for seed is null", clientAuth.getUsername()).getMessage()); NettyUtils.write(ctx.getChannel(), errorBytes, null); + break; } if (!embeddedServer.auth(clientAuth.getUsername(), clientAuth.getPassword().toStringUtf8(), seed)) { byte[] errorBytes = NettyUtils.errorPacket(400, MessageFormatter.format("auth failed for user:{}", clientAuth.getUsername()).getMessage()); NettyUtils.write(ctx.getChannel(), errorBytes, null); + break; } // 如果存在订阅信息