diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/InternalNetworkPermeateServerVisitor.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/InternalNetworkClientPermeateServerVisitor.java similarity index 84% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/InternalNetworkPermeateServerVisitor.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/InternalNetworkClientPermeateServerVisitor.java index 2ae15b0..bb631ae 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/InternalNetworkPermeateServerVisitor.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/InternalNetworkClientPermeateServerVisitor.java @@ -4,14 +4,13 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.common.InternalNetworkPermeate; -import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelFlowAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; import java.util.List; @NoArgsConstructor @Data -public class InternalNetworkPermeateServerVisitor implements InternalNetworkPermeate { +public class InternalNetworkClientPermeateServerVisitor implements InternalNetworkPermeate { /** * 目标地址 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientRealFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientRealFilter.java index c622d9f..bf77a3f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientRealFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientRealFilter.java @@ -1,5 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.filter; +import io.netty.buffer.UnpooledDirectByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateServerVisitorFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateServerVisitorFilter.java index c57f22d..8ba44d3 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateServerVisitorFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateServerVisitorFilter.java @@ -5,16 +5,16 @@ import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkPermeateServerVisitor; +import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; import org.framework.lazy.cloud.network.heartbeat.client.netty.handler.NettyClientPermeateServerVisitorHandler; import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; public class NettyClientPermeateServerVisitorFilter extends DebugChannelInitializer { - private final InternalNetworkPermeateServerVisitor internalNetworkPermeateServerVisitor; + private final InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor; - public NettyClientPermeateServerVisitorFilter(InternalNetworkPermeateServerVisitor internalNetworkPermeateServerVisitor) { - this.internalNetworkPermeateServerVisitor = internalNetworkPermeateServerVisitor; + public NettyClientPermeateServerVisitorFilter(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor) { + this.internalNetworkClientPermeateServerVisitor = internalNetworkClientPermeateServerVisitor; } @@ -31,6 +31,6 @@ public class NettyClientPermeateServerVisitorFilter extends DebugChannelInitiali protected void initChannel0(SocketChannel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast(new ChannelDuplexHandler()); - pipeline.addLast(new NettyClientPermeateServerVisitorHandler(internalNetworkPermeateServerVisitor)); + pipeline.addLast(new NettyClientPermeateServerVisitorHandler(internalNetworkClientPermeateServerVisitor)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java index 57181f7..f0c83bb 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java @@ -8,7 +8,7 @@ import io.netty.channel.ChannelOption; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkPermeateServerVisitor; +import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; import org.framework.lazy.cloud.network.heartbeat.client.netty.advanced.ClientHandleDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.client.netty.socket.NettyClientPermeateServerVisitorTransferSocket; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; @@ -19,11 +19,11 @@ import java.util.UUID; @Slf4j public class NettyClientPermeateServerVisitorHandler extends SimpleChannelInboundHandler { - private final InternalNetworkPermeateServerVisitor internalNetworkPermeateServerVisitor; + private final InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor; // private final NettyChannelPool nettyChannelPool = new DefaultNettyChannelPool(10); - public NettyClientPermeateServerVisitorHandler(InternalNetworkPermeateServerVisitor internalNetworkPermeateServerVisitor) { - this.internalNetworkPermeateServerVisitor = internalNetworkPermeateServerVisitor; + public NettyClientPermeateServerVisitorHandler(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor) { + this.internalNetworkClientPermeateServerVisitor = internalNetworkClientPermeateServerVisitor; } /** @@ -41,14 +41,14 @@ public class NettyClientPermeateServerVisitorHandler extends SimpleChannelInboun // 生成访客ID String visitorId = UUID.randomUUID().toString(); - Integer visitorPort = internalNetworkPermeateServerVisitor.getVisitorPort(); + Integer visitorPort = internalNetworkClientPermeateServerVisitor.getVisitorPort(); log.info("this channel with visitor port:{} use visitorId:{}", visitorPort, visitorId); ChannelAttributeKeyUtils.buildVisitorId(visitorChannel, visitorId); // 判断是否有可用的通道 如果没有创建新的通道 // Channel transferChannel = nettyChannelPool.availableChannel(visitorId); // 创建访客连接服务端通道 - NettyClientPermeateServerVisitorTransferSocket.buildTransferServer(internalNetworkPermeateServerVisitor,visitorChannel); + NettyClientPermeateServerVisitorTransferSocket.buildTransferServer(internalNetworkClientPermeateServerVisitor,visitorChannel); log.debug("客户端渗透服务端访客端口连接成功了,访客ID:{}", visitorId); super.channelActive(ctx); } @@ -67,8 +67,8 @@ public class NettyClientPermeateServerVisitorHandler extends SimpleChannelInboun log.debug("【客户端渗透服务端】访客端口成功接收数据:{}", new String(bytes)); // 使用访客的通信通道 - Integer visitorPort = internalNetworkPermeateServerVisitor.getVisitorPort(); - String clientId = internalNetworkPermeateServerVisitor.getNettyClientProperties().getClientId(); + Integer visitorPort = internalNetworkClientPermeateServerVisitor.getVisitorPort(); + String clientId = internalNetworkClientPermeateServerVisitor.getNettyClientProperties().getClientId(); NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(MessageType.REPORT_CLIENT_PERMEATE_SERVER_TRANSFER); nettyProxyMsg.setVisitorId(visitorId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorSocket.java index 3518ce3..454969e 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorSocket.java @@ -7,7 +7,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; -import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkPermeateServerVisitor; +import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; import org.framework.lazy.cloud.network.heartbeat.client.netty.filter.NettyClientPermeateServerVisitorFilter; import org.framework.lazy.cloud.network.heartbeat.common.NettyClientVisitorContext; import org.framework.lazy.cloud.network.heartbeat.common.NettyVisitorPortContext; @@ -216,16 +216,16 @@ public class NettyClientPermeateServerVisitorSocket implements PermeateVisitorSo if (visitorPort == null) { throw new IllegalArgumentException("visitorPort must not null"); } - InternalNetworkPermeateServerVisitor internalNetworkPermeateServerVisitor = new InternalNetworkPermeateServerVisitor(); + InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor = new InternalNetworkClientPermeateServerVisitor(); - internalNetworkPermeateServerVisitor.setTargetIp(clientTargetIp); - internalNetworkPermeateServerVisitor.setTargetPort(clientTargetPort); - internalNetworkPermeateServerVisitor.setVisitorPort(visitorPort); - internalNetworkPermeateServerVisitor.setNettyClientProperties(nettyClientProperties); - internalNetworkPermeateServerVisitor.setHandleChannelTypeAdvancedList(handleChannelTypeAdvancedList); + internalNetworkClientPermeateServerVisitor.setTargetIp(clientTargetIp); + internalNetworkClientPermeateServerVisitor.setTargetPort(clientTargetPort); + internalNetworkClientPermeateServerVisitor.setVisitorPort(visitorPort); + internalNetworkClientPermeateServerVisitor.setNettyClientProperties(nettyClientProperties); + internalNetworkClientPermeateServerVisitor.setHandleChannelTypeAdvancedList(handleChannelTypeAdvancedList); - NettyClientPermeateServerVisitorFilter nettyClientPermeateServerVisitorFilter = new NettyClientPermeateServerVisitorFilter(internalNetworkPermeateServerVisitor); + NettyClientPermeateServerVisitorFilter nettyClientPermeateServerVisitorFilter = new NettyClientPermeateServerVisitorFilter(internalNetworkClientPermeateServerVisitor); return new NettyClientPermeateServerVisitorSocket(nettyClientPermeateServerVisitorFilter, clientId, visitorPort); } 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 06b37a7..5fad892 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 @@ -7,7 +7,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; -import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkPermeateServerVisitor; +import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; import org.framework.lazy.cloud.network.heartbeat.client.netty.filter.NettyClientPermeateServerTransferFilter; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; @@ -26,9 +26,9 @@ public class NettyClientPermeateServerVisitorTransferSocket { /** * 连接服务端通信通道 *

- * internalNetworkPermeateServerVisitor + * internalNetworkClientPermeateServerVisitor */ - public static void buildTransferServer(InternalNetworkPermeateServerVisitor internalNetworkPermeateServerVisitor, Channel visitorChannel) { + public static void buildTransferServer(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor, Channel visitorChannel) { Bootstrap bootstrap = new Bootstrap(); bootstrap.group(eventLoopGroup) @@ -45,20 +45,20 @@ public class NettyClientPermeateServerVisitorTransferSocket { .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientPermeateServerTransferFilter(new ChannelTypeAdapter(internalNetworkPermeateServerVisitor.getHandleChannelTypeAdvancedList()))) + .handler(new NettyClientPermeateServerTransferFilter(new ChannelTypeAdapter(internalNetworkClientPermeateServerVisitor.getHandleChannelTypeAdvancedList()))) ; - NettyClientProperties nettyClientProperties = internalNetworkPermeateServerVisitor.getNettyClientProperties(); + NettyClientProperties nettyClientProperties = internalNetworkClientPermeateServerVisitor.getNettyClientProperties(); String inetHost = nettyClientProperties.getInetHost(); int inetPort = nettyClientProperties.getInetPort(); // local client id String clientId = nettyClientProperties.getClientId(); - String targetIp = internalNetworkPermeateServerVisitor.getTargetIp(); - Integer targetPort = internalNetworkPermeateServerVisitor.getTargetPort(); + String targetIp = internalNetworkClientPermeateServerVisitor.getTargetIp(); + Integer targetPort = internalNetworkClientPermeateServerVisitor.getTargetPort(); String visitorId = ChannelAttributeKeyUtils.getVisitorId(visitorChannel); - Integer visitorPort = internalNetworkPermeateServerVisitor.getVisitorPort(); + Integer visitorPort = internalNetworkClientPermeateServerVisitor.getVisitorPort(); // 客户端新建访客通道 连接服务端IP:{},连接服务端端口:{} log.debug("Client creates a new visitor channel to connect to server IP: {}, connecting to server port: {}", inetHost, inetPort); @@ -89,7 +89,7 @@ public class NettyClientPermeateServerVisitorTransferSocket { log.warn("客户端渗透服务端通信通道中断...."); transferChannel.eventLoop().schedule(() -> { try { - buildTransferServer(internalNetworkPermeateServerVisitor, visitorChannel); + buildTransferServer(internalNetworkClientPermeateServerVisitor, visitorChannel); } catch (Exception e) { e.printStackTrace(); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/filter/NettyServerPermeateServerRealFilter.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/filter/NettyServerPermeateServerRealFilter.java index 1f2ef67..dc850cf 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/filter/NettyServerPermeateServerRealFilter.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/filter/NettyServerPermeateServerRealFilter.java @@ -5,7 +5,6 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; -import io.netty.handler.ssl.SslHandler; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.InternalNetworkServerPermeateServerRealServer; @@ -14,9 +13,6 @@ import org.framework.lazy.cloud.network.heartbeat.common.encoder.TransferEncoder import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; import org.framework.lazy.cloud.network.heartbeat.server.netty.handler.NettyServerPermeateServerRealHandler; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLEngine; - @Slf4j public class NettyServerPermeateServerRealFilter extends DebugChannelInitializer { private final InternalNetworkServerPermeateServerRealServer internalNetworkServerPermeateServerRealServer;