From 663d616f21892d1f89b2ae23dfa97c5567703c43 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 13 Oct 2014 18:43:24 +0200 Subject: [PATCH] Added SSL support to Nexus Client --- .../opis/network/rcon/nexus/NexusClient.java | 27 ++++++++++------- .../rcon/nexus/NexusHandshakeDecoder.java | 17 +++++++++++ .../rcon/nexus/NexusHandshakeHandler.java | 29 +++++++++++++++++++ .../rcon/nexus/NexusInboundHandler.java | 2 +- 4 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeDecoder.java create mode 100644 src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeHandler.java diff --git a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusClient.java b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusClient.java index 6a599e1..51f0350 100644 --- a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusClient.java +++ b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusClient.java @@ -12,6 +12,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.ssl.SslContext; +import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.handler.ssl.util.SelfSignedCertificate; import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.handler.timeout.WriteTimeoutHandler; @@ -47,21 +48,20 @@ import mcp.mobius.opis.network.rcon.server.RConServer; public class NexusClient implements Runnable { class ChannelInit extends ChannelInitializer{ - //private final SslContext sslCtx; - //public ChannelInit(SslContext sslCtx) { - // this.sslCtx = sslCtx; - //} + private final SslContext sslCtx; + public ChannelInit(SslContext sslCtx) { this.sslCtx = sslCtx; } @Override protected void initChannel(SocketChannel ch) throws Exception { - //ch.pipeline().addLast(sslCtx.newHandler(ch.alloc(), RConClient.instance.host, RConClient.instance.port)); - //ch.pipeline().addLast(new RConHandshakeDecoder()); - //ch.pipeline().addLast(new RConHandshakeHandler()); + ch.pipeline().addLast(sslCtx.newHandler(ch.alloc(), NexusClient.instance.host, NexusClient.instance.port)); + ch.pipeline().addLast(new NexusHandshakeDecoder()); + ch.pipeline().addLast(new NexusHandshakeHandler()); //ch.pipeline().addLast(new JdkZlibDecoder()); //ch.pipeline().addLast(new JdkZlibEncoder()); //ch.pipeline().addLast(new WriteTimeoutHandler(5)); - ch.pipeline().addLast(new NexusMsgDecoder()); - ch.pipeline().addLast(new NexusInboundHandler()); + + //ch.pipeline().addLast(new NexusMsgDecoder()); + //ch.pipeline().addLast(new NexusInboundHandler()); } } @@ -87,6 +87,13 @@ public class NexusClient implements Runnable { modOpis.log.info(String.format("Connecting to OpixNexus %s:%s", this.host, this.port)); + SslContext sslCtx = null; + try { + sslCtx = SslContext.newClientContext(InsecureTrustManagerFactory.INSTANCE); + } catch (SSLException e) { + e.printStackTrace(); + } + EventLoopGroup workerGroup = new NioEventLoopGroup(); try { @@ -94,7 +101,7 @@ public class NexusClient implements Runnable { b.group(workerGroup); // (2) b.channel(NioSocketChannel.class); // (3) b.option(ChannelOption.SO_KEEPALIVE, true); // (4) - b.handler(new ChannelInit()); + b.handler(new ChannelInit(sslCtx)); ChannelFuture f = b.connect(this.host, this.port).sync(); // (5) // Wait until the connection is closed. diff --git a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeDecoder.java b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeDecoder.java new file mode 100644 index 0000000..6010e3f --- /dev/null +++ b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeDecoder.java @@ -0,0 +1,17 @@ +package mcp.mobius.opis.network.rcon.nexus; + +import java.util.List; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; + +public class NexusHandshakeDecoder extends ByteToMessageDecoder { + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception { + if (in.readableBytes() < 1) { return; } + out.add(in.readBoolean()); + } + +} diff --git a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeHandler.java b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeHandler.java new file mode 100644 index 0000000..ff61e7d --- /dev/null +++ b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusHandshakeHandler.java @@ -0,0 +1,29 @@ +package mcp.mobius.opis.network.rcon.nexus; + +import mcp.mobius.opis.modOpis; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.handler.ssl.SslHandler; +import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.GenericFutureListener; +import io.netty.channel.Channel; + +public class NexusHandshakeHandler extends ChannelInboundHandlerAdapter { + + @Override + public void channelActive(final ChannelHandlerContext ctx) throws Exception { + modOpis.log.info("SSL encryption activated."); + ctx.pipeline().remove(NexusHandshakeDecoder.class); + ctx.pipeline().remove(NexusHandshakeHandler.class); + ctx.pipeline().addLast(new NexusMsgDecoder()); + ctx.pipeline().addLast(new NexusInboundHandler()); + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + cause.printStackTrace(); + ctx.close(); + } + +} diff --git a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java index 8abac26..4d04243 100644 --- a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java +++ b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java @@ -30,7 +30,7 @@ import io.netty.handler.codec.ByteToMessageDecoder; public class NexusInboundHandler extends ChannelInboundHandlerAdapter { @Override - public void channelActive(final ChannelHandlerContext ctx) { + public void handlerAdded(final ChannelHandlerContext ctx) { UUID fakeUUID = UUID.randomUUID(); FakePlayer fakePlayer = FakePlayerFactory.get(DimensionManager.getWorld(0), new GameProfile(fakeUUID, ctx.name()));