From 09cae122d164d240a65b8ff43714be33eba3914d Mon Sep 17 00:00:00 2001 From: Gravit Date: Thu, 9 May 2019 21:16:55 +0700 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4?= =?UTF-8?q?=D0=BA=D0=B0=20NettyIpForwardHandler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gravit/launchserver/websocket/LauncherNettyServer.java | 2 +- .../gravit/launchserver/websocket/NettyIpForwardHandler.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java index 3a0f6f0e..ae471ace 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java @@ -44,10 +44,10 @@ public void initChannel(NioSocketChannel ch) { //p.addLast(new LoggingHandler(LogLevel.INFO)); pipeline.addLast(new HttpServerCodec()); pipeline.addLast(new HttpObjectAggregator(65536)); + if (LaunchServer.server.config.netty.ipForwarding) pipeline.addLast(new NettyIpForwardHandler(context)); pipeline.addLast(new WebSocketServerCompressionHandler()); pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true)); if (LaunchServer.server.config.netty.fileServerEnabled) pipeline.addLast(new FileServerHandler(LaunchServer.server.updatesDir, true)); - if (LaunchServer.server.config.netty.ipForwarding) pipeline.addLast(new NettyIpForwardHandler(context)); pipeline.addLast(new WebSocketFrameHandler(context)); } }); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java index 3e907ddd..ab9cb594 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java @@ -5,6 +5,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.http.DefaultHttpRequest; import io.netty.handler.codec.http.HttpHeaders; +import io.netty.handler.codec.http.HttpRequest; import ru.gravit.utils.helper.LogHelper; public class NettyIpForwardHandler extends ChannelInboundHandlerAdapter { @@ -19,9 +20,9 @@ public NettyIpForwardHandler(NettyConnectContext context) { public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { //super.channelRead(ctx, msg); if(context.ip != null) return; - if(msg instanceof DefaultHttpRequest) + if(msg instanceof HttpRequest) { - DefaultHttpRequest http = (DefaultHttpRequest) msg; + HttpRequest http = (HttpRequest) msg; HttpHeaders headers = http.headers(); String realIP = null; if(headers.contains("X-Forwarded-For"))