nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-23 07:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
SSL Error handeling & Proxy information in connection

See merge request morningstar/Arcturus-Community!14
This commit is contained in:
John 2023-01-05 02:42:05 +00:00
commit 51343af9c3
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/eu/habbo/habbohotel/users/Habbo.java
View File

@ -118,10 +118,17 @@ public class Habbo implements Runnable {
public boolean connect() { public boolean connect() {
String ip = ""; String ip = "";
String ProxyIP = "";
if (!Emulator.getConfig().getBoolean("networking.tcp.proxy") && this.client.getChannel().remoteAddress() != null) { if (!Emulator.getConfig().getBoolean("networking.tcp.proxy") && this.client.getChannel().remoteAddress() != null) {
SocketAddress address = this.client.getChannel().remoteAddress(); SocketAddress address = this.client.getChannel().remoteAddress();
ip = ((InetSocketAddress) address).getAddress().getHostAddress(); ip = ((InetSocketAddress) address).getAddress().getHostAddress();
ProxyIP = "- no proxy server used";
}
else
{
SocketAddress address = this.client.getChannel().remoteAddress();
ProxyIP = ((InetSocketAddress) address).getAddress().getHostAddress();
} }
if (Emulator.getPluginManager().isRegistered(UserGetIPAddressEvent.class, true)) { if (Emulator.getPluginManager().isRegistered(UserGetIPAddressEvent.class, true)) {
@ -149,7 +156,7 @@ public class Habbo implements Runnable {
this.messenger.connectionChanged(this, true, false); this.messenger.connectionChanged(this, true, false);
Emulator.getGameEnvironment().getRoomManager().loadRoomsForHabbo(this); Emulator.getGameEnvironment().getRoomManager().loadRoomsForHabbo(this);
LOGGER.info("{} logged in from IP {}", this.habboInfo.getUsername(), this.habboInfo.getIpLogin()); LOGGER.info("{} logged in from IP {} using proxyserver {}", this.habboInfo.getUsername(), this.habboInfo.getIpLogin(), ProxyIP);
return true; return true;
} }

40
src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java
View File

@ -7,11 +7,18 @@ import com.eu.habbo.threading.runnables.ChannelReadHandler;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.DecoderException;
import io.netty.handler.codec.TooLongFrameException; import io.netty.handler.codec.TooLongFrameException;
import io.netty.handler.codec.UnsupportedMessageTypeException;
import io.netty.handler.ssl.NotSslRecordException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
import java.io.IOException; import java.io.IOException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@ChannelHandler.Sharable @ChannelHandler.Sharable
public class GameMessageHandler extends ChannelInboundHandlerAdapter { public class GameMessageHandler extends ChannelInboundHandlerAdapter {
@ -60,13 +67,34 @@ public class GameMessageHandler extends ChannelInboundHandlerAdapter {
return; return;
} }
if (Emulator.getConfig().getBoolean("debug.mode")) { if (Emulator.getConfig().getBoolean("debug.mode")) {
if (cause instanceof TooLongFrameException) { if (cause instanceof NotSslRecordException) {
LOGGER.error("Disconnecting client, reason: \"" + cause.getMessage() + "\"."); LOGGER.error("Plaintext received instead of ssl, closing channel");
} else { }
LOGGER.error("Disconnecting client, exception in GameMessageHander.", cause); else if (cause instanceof DecoderException) {
LOGGER.error("Plaintext received instead of ssl, closing channel");
}
else if (cause instanceof TooLongFrameException) {
LOGGER.error("Disconnecting client, reason " + cause.getMessage());
}
else if (cause instanceof SSLHandshakeException) {
LOGGER.error("URL Request error from source " + ctx.channel().remoteAddress());
}
else if (cause instanceof NoSuchAlgorithmException) {
LOGGER.error("Invalid SSL algorithm, only TLSv1.2 supported in the request");
}
else if (cause instanceof KeyManagementException) {
LOGGER.error("Invalid SSL algorithm, only TLSv1.2 supported in the request");
}
else if (cause instanceof UnsupportedMessageTypeException) {
LOGGER.error("There was an illegal SSL request from (X-forwarded-for/CF-Connecting-IP has not being injected yet!) " + ctx.channel().remoteAddress());
}
else if (cause instanceof SSLException) {
LOGGER.error("SSL Problem: "+ cause.getMessage() + cause);
}
else {
LOGGER.error("Disconnecting client, exception in GameMessageHandler.", cause);
} }
} }
ctx.channel().close(); ctx.channel().close();
} }
}
}