From b2cd1eee0a94478f11add22545365307a62180ef Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Mon, 28 Oct 2024 14:24:16 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=20=E9=80=9A=E9=81=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0appKey=E3=80=81appSecret=E3=80=81originalIp?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../netty/socket/NettyClientPermeateClientRealSocket.java | 2 +- .../socket/NettyClientPermeateClientVisitorTransferSocket.java | 2 +- .../socket/NettyClientPermeateServerVisitorTransferSocket.java | 2 +- .../heartbeat/client/netty/socket/NettyClientSocket.java | 2 +- .../netty/socket/NettyServerPermeateClientRealSocket.java | 2 +- .../lazy/cloud/network/heartbeat/common/ChannelContext.java | 2 ++ .../socket/NettyClientPermeateServerConnectRealSocket.java | 2 +- .../socket/NettyServerPermeateServerConnectRealSocket.java | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java index 053765d..b3a933b 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java @@ -156,7 +156,7 @@ public class NettyClientPermeateClientRealSocket { } else { log.info("无法连接到服务端...."); - transferChannel.eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { try { newVisitorConnect2Server(clientId, clientTargetIp, diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientVisitorTransferSocket.java index 9ad31ff..11d8a85 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientVisitorTransferSocket.java @@ -91,7 +91,7 @@ public class NettyClientPermeateClientVisitorTransferSocket { } else { log.info("无法连接到服务端...."); - transferChannel.eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { try { buildTransferServer(internalNetworkClientPermeateClientVisitor,visitorChannel); } catch (Exception e) { diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java index 5fad892..48aaa72 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java @@ -87,7 +87,7 @@ public class NettyClientPermeateServerVisitorTransferSocket { } else { log.warn("客户端渗透服务端通信通道中断...."); - transferChannel.eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { try { buildTransferServer(internalNetworkClientPermeateServerVisitor, visitorChannel); } catch (Exception e) { diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientSocket.java index 36a955d..3f26d72 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientSocket.java @@ -119,7 +119,7 @@ public class NettyClientSocket { // 离线 NettyServerContext.removeServerEndpointChannels(serverId, clientId); clientChangeEvent.clientOffLine(inetHost, inetPort,serverId, clientId); - futureListener.channel().eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { try { newConnect2Server(inetHost, inetPort, clientId, serverId, clientChangeEvent); } catch (InterruptedException e) { diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyServerPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyServerPermeateClientRealSocket.java index e3a8e84..1ecf0af 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyServerPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyServerPermeateClientRealSocket.java @@ -201,7 +201,7 @@ public class NettyServerPermeateClientRealSocket { } else { log.info("每隔2s重连...."); // 离线 - transferChannel.eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { try { newVisitorConnect2Server(internalNetworkPenetrationRealClient, nettyClientProperties, handleChannelTypeAdvancedList,realChannel); } catch (InterruptedException e) { diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java index 325960e..06822fb 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java @@ -2,6 +2,7 @@ package org.framework.lazy.cloud.network.heartbeat.common; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; +import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -36,6 +37,7 @@ public class ChannelContext { if(existChannel.isActive()){ existChannelList.add(existChannel); }else { + log.warn("close channel with client:{}", ChannelAttributeKeyUtils.getClientId(existChannel)); existChannel.close(); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyClientPermeateServerConnectRealSocket.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyClientPermeateServerConnectRealSocket.java index 33824e1..6f057e1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyClientPermeateServerConnectRealSocket.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyClientPermeateServerConnectRealSocket.java @@ -71,7 +71,7 @@ public class NettyClientPermeateServerConnectRealSocket { } else { log.error("服务端内网渗透 无法连接当前网络内的目标IP：【{}】,目标端口:【{}】", targetIp, targetPort); - channelFuture.channel().eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { buildNewRealServer(visitorId, visitorPort, targetIp, targetPort, transferChannel); }, 2, TimeUnit.SECONDS); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyServerPermeateServerConnectRealSocket.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyServerPermeateServerConnectRealSocket.java index 3c934e2..656d35e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyServerPermeateServerConnectRealSocket.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/socket/NettyServerPermeateServerConnectRealSocket.java @@ -76,7 +76,7 @@ public class NettyServerPermeateServerConnectRealSocket { } else { log.error("服务端内网渗透 无法连接当前网络内的目标IP：【{}】,目标端口:【{}】", clientTargetIp, clientTargetPort); - channelFuture.channel().eventLoop().schedule(() -> { + eventLoopGroup.schedule(() -> { buildNewRealServer(internalNetworkServerPermeateServerRealServer, visitorChannel, visitorId); }, 2, TimeUnit.SECONDS); }