Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MapleClient for session management

Browse Source 
First working version of the Netty implementation,
but there's a lot remaining to be done.
This commit is contained in:
P0nk
2021-07-11 18:56:45 +02:00
parent 86224f5152
commit 5a7d8e6b1f
23 changed files with 210 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/client/MapleClient.java
View File

@@ -92,12 +92,12 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
public static final String CLIENT_REMOTE_ADDRESS = "REMOTE_IP"; public static final String CLIENT_REMOTE_ADDRESS = "REMOTE_IP";
private Hwid hwid; private Hwid hwid;
private String remoteHwid; // Mac address + hwid in one. Retrieved from client when attempting to enter game.
private String remoteAddress; private String remoteAddress;
private volatile boolean inTransition; private volatile boolean inTransition;
private MapleAESOFB send; private MapleAESOFB send;
private MapleAESOFB receive; private MapleAESOFB receive;
private final IoSession session;
private io.netty.channel.Channel ioChannel; private io.netty.channel.Channel ioChannel;
private PacketProcessor packetProcessor; private PacketProcessor packetProcessor;
@@ -148,13 +148,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
this.packetProcessor = packetProcessor; this.packetProcessor = packetProcessor;
this.world = world; this.world = world;
this.channel = channel; this.channel = channel;
this.session = null; // TODO remove once the other constructor is removed
} }
public MapleClient(MapleAESOFB send, MapleAESOFB receive, IoSession session) { public MapleClient(MapleAESOFB send, MapleAESOFB receive, IoSession session) {
this.send = send; this.send = send;
this.receive = receive; this.receive = receive;
this.session = session;
} }
@Override @Override
@@ -266,10 +264,6 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
return send; return send;
} }
public IoSession getSession() {
return session;
}
public Hwid getHwid() { public Hwid getHwid() {
return hwid; return hwid;
} }
@@ -278,6 +272,14 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
this.hwid = hwid; this.hwid = hwid;
} }
public String getRemoteHwid() {
return remoteHwid;
}
public void setRemoteHwid(String remoteHwid) {
this.remoteHwid = remoteHwid;
}
public String getRemoteAddress() { public String getRemoteAddress() {
return remoteAddress; return remoteAddress;
} }
@@ -352,7 +354,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
boolean ret = false; boolean ret = false;
try (Connection con = DatabaseConnection.getConnection(); try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM ipbans WHERE ? LIKE CONCAT(ip, '%')")) { PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM ipbans WHERE ? LIKE CONCAT(ip, '%')")) {
ps.setString(1, session.getRemoteAddress().toString()); ps.setString(1, remoteAddress);
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
rs.next(); rs.next();
if (rs.getInt(1) > 0) { if (rs.getInt(1) > 0) {
@@ -576,7 +578,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
pinattempt++; pinattempt++;
if (pinattempt > 5) { if (pinattempt > 5) {
MapleSessionCoordinator.getInstance().closeSession(session, false); MapleSessionCoordinator.getInstance().closeSession(this, false);
} }
if (pin.equals(other)) { if (pin.equals(other)) {
pinattempt = 0; pinattempt = 0;
@@ -609,7 +611,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
picattempt++; picattempt++;
if (picattempt > 5) { if (picattempt > 5) {
MapleSessionCoordinator.getInstance().closeSession(session, false); MapleSessionCoordinator.getInstance().closeSession(this, false);
} }
if (pic.equals(other)) { // thanks ryantpayton (HeavenClient) for noticing null pics being checked here if (pic.equals(other)) { // thanks ryantpayton (HeavenClient) for noticing null pics being checked here
picattempt = 0; picattempt = 0;
@@ -625,7 +627,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
loginattempt++; loginattempt++;
if (loginattempt > 4) { if (loginattempt > 4) {
loggedIn = false; loggedIn = false;
MapleSessionCoordinator.getInstance().closeSession(session, false); MapleSessionCoordinator.getInstance().closeSession(this, false);
return 6; // thanks Survival_Project for finding out an issue with AUTOMATIC_REGISTER here return 6; // thanks Survival_Project for finding out an issue with AUTOMATIC_REGISTER here
} }
@@ -677,7 +679,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
} }
if (loginok == 0 || loginok == 4) { if (loginok == 0 || loginok == 4) {
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptLoginSession(session, nibbleHwid, accId, loginok == 4); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptLoginSession(this, nibbleHwid, accId, loginok == 4);
switch (res) { switch (res) {
case SUCCESS: case SUCCESS:
@@ -812,7 +814,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
public void updateLoginState(int newState) { public void updateLoginState(int newState) {
// rules out possibility of multiple account entries // rules out possibility of multiple account entries
if (newState == LOGIN_LOGGEDIN) { if (newState == LOGIN_LOGGEDIN) {
MapleSessionCoordinator.getInstance().updateOnlineClient(session); MapleSessionCoordinator.getInstance().updateOnlineClient(this);
} }
try (Connection con = DatabaseConnection.getConnection(); try (Connection con = DatabaseConnection.getConnection();
@@ -1046,18 +1048,14 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
} }
} }
} }
MapleSessionCoordinator.getInstance().closeSession(this, false);
if (!serverTransition && isLoggedIn()) { if (!serverTransition && isLoggedIn()) {
MapleSessionCoordinator.getInstance().closeSession(session, false);
updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
session.removeAttribute(MapleClient.CLIENT_KEY); // prevents double dcing during login
clear(); clear();
} else { } else {
if (session.containsAttribute(MapleClient.CLIENT_KEY)) {
MapleSessionCoordinator.getInstance().closeSession(session, false);
session.removeAttribute(MapleClient.CLIENT_KEY);
}
if (!Server.getInstance().hasCharacteridInTransition(this)) { if (!Server.getInstance().hasCharacteridInTransition(this)) {
updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
} }
@@ -1154,18 +1152,9 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
lastPong = Server.getInstance().getCurrentTime(); lastPong = Server.getInstance().getCurrentTime();
} }
@Deprecated(forRemoval = true)
public void testPing(long timeThen) { public void testPing(long timeThen) {
try { throw new UnsupportedOperationException();
if (lastPong < timeThen) {
if (session != null && session.isConnected()) {
MapleSessionCoordinator.getInstance().closeSession(session, false);
updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
session.removeAttribute(MapleClient.CLIENT_KEY);
}
}
} catch (NullPointerException e) {
e.printStackTrace();
}
} }
public void checkIfIdle(final IdleStateEvent event) { public void checkIfIdle(final IdleStateEvent event) {
@@ -1522,7 +1511,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
return; return;
} }
String[] socket = Server.getInstance().getInetSocket(this.getSession(), getWorld(), channel); String[] socket = Server.getInstance().getInetSocket(this, getWorld(), channel);
if (socket == null) { if (socket == null) {
announce(MaplePacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel.")); announce(MaplePacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel."));
announce(MaplePacketCreator.enableActions()); announce(MaplePacketCreator.enableActions());
@@ -1619,8 +1608,13 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
announce(MaplePacketCreator.enableCSUse(player)); announce(MaplePacketCreator.enableCSUse(player));
} }
@Deprecated
public String getNibbleHWID() { public String getNibbleHWID() {
return (String) session.getAttribute(MapleClient.CLIENT_NIBBLEHWID); if (hwid != null) {
return hwid.hwid();
}
return null;
} }
public boolean canBypassPin() { public boolean canBypassPin() {
@@ -1638,4 +1632,8 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
public void setLanguage(int lingua) { public void setLanguage(int lingua) {
this.lang = lingua; this.lang = lingua;
} }
public static MapleClient getPlaceholder() {
return null;
}
} }

2
src/main/java/client/command/commands/gm3/BanCommand.java
View File

@@ -52,7 +52,7 @@ public class BanCommand extends Command {
MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign); MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign);
if (target != null) { if (target != null) {
String readableTargetName = MapleCharacter.makeMapleReadable(target.getName()); String readableTargetName = MapleCharacter.makeMapleReadable(target.getName());
String ip = target.getClient().getSession().getRemoteAddress().toString().split(":")[0]; String ip = target.getClient().getRemoteAddress();
//Ban ip //Ban ip
try (Connection con = DatabaseConnection.getConnection()) { try (Connection con = DatabaseConnection.getConnection()) {
if (ip.matches("/[0-9]{1,3}\\..*")) { if (ip.matches("/[0-9]{1,3}\\..*")) {

2
src/main/java/client/command/commands/gm5/IpListCommand.java
View File

@@ -50,7 +50,7 @@ public class IpListCommand extends Command {
str += "\r\n" + GameConstants.WORLD_NAMES[w.getId()] + "\r\n"; str += "\r\n" + GameConstants.WORLD_NAMES[w.getId()] + "\r\n";
for (MapleCharacter chr : chars) { for (MapleCharacter chr : chars) {
str += " " + chr.getName() + " - " + chr.getClient().getSession().getRemoteAddress() + "\r\n"; str += " " + chr.getName() + " - " + chr.getClient().getRemoteAddress() + "\r\n";
} }
} }
} }

2
src/main/java/client/command/commands/gm6/WarpWorldCommand.java
View File

@@ -49,7 +49,7 @@ public class WarpWorldCommand extends Command {
byte worldb = Byte.parseByte(params[0]); byte worldb = Byte.parseByte(params[0]);
if (worldb <= (server.getWorldsSize() - 1)) { if (worldb <= (server.getWorldsSize() - 1)) {
try { try {
String[] socket = server.getInetSocket(c.getSession(), worldb, c.getChannel()); String[] socket = server.getInetSocket(c, worldb, c.getChannel());
c.getWorldServer().removePlayer(player); c.getWorldServer().removePlayer(player);
player.getMap().removePlayer(player);//LOL FORGOT THIS >< player.getMap().removePlayer(player);//LOL FORGOT THIS ><
player.setSessionTransitionState(); player.setSessionTransitionState();

33
src/main/java/net/MapleServerHandler.java
View File

@@ -115,28 +115,29 @@ public class MapleServerHandler extends IoHandlerAdapter {
session.setAttribute(MapleClient.CLIENT_REMOTE_ADDRESS, remoteHost); session.setAttribute(MapleClient.CLIENT_REMOTE_ADDRESS, remoteHost);
if (!Server.getInstance().isOnline()) { if (!Server.getInstance().isOnline()) {
MapleSessionCoordinator.getInstance().closeSession(session, true); MapleSessionCoordinator.getInstance().closeSession(MapleClient.getPlaceholder(), true);
return; return;
} }
if (!isLoginServerHandler()) {
if (Server.getInstance().getChannel(world, channel) == null) {
MapleSessionCoordinator.getInstance().closeSession(session, true);
return;
}
} else {
if (!MapleSessionCoordinator.getInstance().canStartLoginSession(session)) {
return;
}
FilePrinter.print(FilePrinter.SESSION, "IoSession with " + session.getRemoteAddress() + " opened on " + sdf.format(Calendar.getInstance().getTime()), false);
}
final InitializationVector ivSend = InitializationVector.generateSend(); final InitializationVector ivSend = InitializationVector.generateSend();
final InitializationVector ivRecv = InitializationVector.generateReceive(); final InitializationVector ivRecv = InitializationVector.generateReceive();
MapleAESOFB sendCypher = new MapleAESOFB(ivSend, (short) (0xFFFF - ServerConstants.VERSION)); MapleAESOFB sendCypher = new MapleAESOFB(ivSend, (short) (0xFFFF - ServerConstants.VERSION));
MapleAESOFB recvCypher = new MapleAESOFB(ivRecv, ServerConstants.VERSION); MapleAESOFB recvCypher = new MapleAESOFB(ivRecv, ServerConstants.VERSION);
MapleClient client = new MapleClient(sendCypher, recvCypher, session); MapleClient client = new MapleClient(sendCypher, recvCypher, session);
if (!isLoginServerHandler()) {
if (Server.getInstance().getChannel(world, channel) == null) {
MapleSessionCoordinator.getInstance().closeSession(MapleClient.getPlaceholder(), true);
return;
}
} else {
if (!MapleSessionCoordinator.getInstance().canStartLoginSession(client)) {
return;
}
FilePrinter.print(FilePrinter.SESSION, "IoSession with " + session.getRemoteAddress() + " opened on " + sdf.format(Calendar.getInstance().getTime()), false);
}
client.setWorld(world); client.setWorld(world);
client.setChannel(channel); client.setChannel(channel);
client.setSessionId(sessionId.getAndIncrement()); // Generates a reasonable session id. client.setSessionId(sessionId.getAndIncrement()); // Generates a reasonable session id.
@@ -146,9 +147,9 @@ public class MapleServerHandler extends IoHandlerAdapter {
private void closeMapleSession(IoSession session) { private void closeMapleSession(IoSession session) {
if (isLoginServerHandler()) { if (isLoginServerHandler()) {
MapleSessionCoordinator.getInstance().closeLoginSession(session); MapleSessionCoordinator.getInstance().closeLoginSession(MapleClient.getPlaceholder());
} else { } else {
MapleSessionCoordinator.getInstance().closeSession(session, null); MapleSessionCoordinator.getInstance().closeSession(MapleClient.getPlaceholder(), null);
} }
MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY); MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);

6
src/main/java/net/mina/MaplePacketDecoder.java
View File

@@ -46,7 +46,7 @@ public class MaplePacketDecoder extends CumulativeProtocolDecoder {
protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws Exception { protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws Exception {
final MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY); final MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);
if(client == null) { if(client == null) {
MapleSessionCoordinator.getInstance().closeSession(session, true); MapleSessionCoordinator.getInstance().closeSession(MapleClient.getPlaceholder(), true);
return false; return false;
} }
@@ -60,7 +60,7 @@ public class MaplePacketDecoder extends CumulativeProtocolDecoder {
if (in.remaining() >= 4 && decoderState.packetlength == -1) { if (in.remaining() >= 4 && decoderState.packetlength == -1) {
int packetHeader = in.getInt(); int packetHeader = in.getInt();
if (!rcvdCrypto.isValidHeader(packetHeader)) { if (!rcvdCrypto.isValidHeader(packetHeader)) {
MapleSessionCoordinator.getInstance().closeSession(session, true); MapleSessionCoordinator.getInstance().closeSession(MapleClient.getPlaceholder(), true);
return false; return false;
} }
decoderState.packetlength = MapleAESOFB.getPacketLength(packetHeader); decoderState.packetlength = MapleAESOFB.getPacketLength(packetHeader);
@@ -87,7 +87,7 @@ public class MaplePacketDecoder extends CumulativeProtocolDecoder {
System.out.println("UnknownPacket:" + SendTo); System.out.println("UnknownPacket:" + SendTo);
} }
} else { } else {
FilePrinter.print(FilePrinter.PACKET_STREAM + MapleSessionCoordinator.getSessionRemoteAddress(session) + ".txt", HexTool.toString(new byte[]{decryptedPacket[0], decryptedPacket[1]}) + "..."); FilePrinter.print(FilePrinter.PACKET_STREAM + ".txt", HexTool.toString(new byte[]{decryptedPacket[0], decryptedPacket[1]}) + "...");
} }
} }
return true; return true;

9
src/main/java/net/mina/MaplePacketEncoder.java
View File

@@ -21,19 +21,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package net.mina; package net.mina;
import config.YamlConfig;
import client.MapleClient; import client.MapleClient;
import config.YamlConfig;
import constants.net.OpcodeConstants; import constants.net.OpcodeConstants;
import net.server.coordinator.session.MapleSessionCoordinator;
import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput; import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import tools.MapleAESOFB; import tools.FilePrinter;
import tools.HexTool; import tools.HexTool;
import tools.MapleAESOFB;
import tools.data.input.ByteArrayByteStream; import tools.data.input.ByteArrayByteStream;
import tools.data.input.GenericLittleEndianAccessor; import tools.data.input.GenericLittleEndianAccessor;
import tools.FilePrinter;
public class MaplePacketEncoder implements ProtocolEncoder { public class MaplePacketEncoder implements ProtocolEncoder {
@@ -59,7 +58,7 @@ public class MaplePacketEncoder implements ProtocolEncoder {
System.out.println("UnknownPacket:" + RecvTo); System.out.println("UnknownPacket:" + RecvTo);
} }
} else { } else {
FilePrinter.print(FilePrinter.PACKET_STREAM + MapleSessionCoordinator.getSessionRemoteAddress(session) + ".txt", HexTool.toString(new byte[]{input[0], input[1]}) + " ..."); FilePrinter.print(FilePrinter.PACKET_STREAM + ".txt", HexTool.toString(new byte[]{input[0], input[1]}) + " ...");
} }
} }

9
src/main/java/net/server/Server.java
View File

@@ -58,7 +58,6 @@ import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.buffer.SimpleBufferAllocator; import org.apache.mina.core.buffer.SimpleBufferAllocator;
import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -294,8 +293,8 @@ public class Server {
} }
} }
public String[] getInetSocket(IoSession session, int world, int channel) { public String[] getInetSocket(MapleClient client, int world, int channel) {
String remoteIp = MapleSessionCoordinator.getSessionRemoteAddress(session); String remoteIp = client.getRemoteAddress();
String[] hostAddress = getIP(world, channel).split(":"); String[] hostAddress = getIP(world, channel).split(":");
if (IpAddresses.isLocalAddress(remoteIp)) { if (IpAddresses.isLocalAddress(remoteIp)) {
@@ -1792,7 +1791,7 @@ public class Server {
} }
private static String getRemoteHost(MapleClient client) { private static String getRemoteHost(MapleClient client) {
return MapleSessionCoordinator.getSessionRemoteHost(client.getSession()); return MapleSessionCoordinator.getSessionRemoteHost(client);
} }
public void setCharacteridInTransition(MapleClient client, int charId) { public void setCharacteridInTransition(MapleClient client, int charId) {
@@ -1894,7 +1893,7 @@ public class Server {
if (c.isLoggedIn()) { if (c.isLoggedIn()) {
c.disconnect(false, false); c.disconnect(false, false);
} else { } else {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
} }
} }
} }

2
src/main/java/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -86,7 +86,7 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler {
target = c.getChannelServer().getPlayerStorage().getCharacterByName(victim); target = c.getChannelServer().getPlayerStorage().getCharacterByName(victim);
if (target != null) { if (target != null) {
String readableTargetName = MapleCharacter.makeMapleReadable(target.getName()); String readableTargetName = MapleCharacter.makeMapleReadable(target.getName());
String ip = target.getClient().getSession().getRemoteAddress().toString().split(":")[0]; String ip = target.getClient().getRemoteAddress();
reason += readableTargetName + " (IP: " + ip + ")"; reason += readableTargetName + " (IP: " + ip + ")";
if (duration == -1) { if (duration == -1) {
target.ban(description + " " + reason); target.ban(description + " " + reason);

14
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -39,7 +39,6 @@ import net.server.guild.MapleGuild;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
import net.server.world.PartyOperation; import net.server.world.PartyOperation;
import net.server.world.World; import net.server.world.World;
import org.apache.mina.core.session.IoSession;
import scripting.event.EventInstanceManager; import scripting.event.EventInstanceManager;
import server.life.MobSkill; import server.life.MobSkill;
import tools.DatabaseConnection; import tools.DatabaseConnection;
@@ -112,11 +111,10 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
} }
MapleCharacter player = wserv.getPlayerStorage().getCharacterById(cid); MapleCharacter player = wserv.getPlayerStorage().getCharacterById(cid);
IoSession session = c.getSession();
String remoteHwid; String remoteHwid;
if (player == null) { if (player == null) {
remoteHwid = MapleSessionCoordinator.getInstance().pickLoginSessionHwid(session); remoteHwid = MapleSessionCoordinator.getInstance().pickLoginSessionHwid(c);
if (remoteHwid == null) { if (remoteHwid == null) {
c.disconnect(true, false); c.disconnect(true, false);
return; return;
@@ -126,10 +124,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
remoteHwid = clientHwid == null ? null : clientHwid.hwid(); remoteHwid = clientHwid == null ? null : clientHwid.hwid();
} }
int hwidLen = remoteHwid.length(); c.setRemoteHwid(remoteHwid);
session.setAttribute(MapleClient.CLIENT_HWID, remoteHwid);
String nibbleHwid = remoteHwid.substring(hwidLen - 8, hwidLen);
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, nibbleHwid);
c.setHwid(new Hwid(remoteHwid)); c.setHwid(new Hwid(remoteHwid));
if (!server.validateCharacteridInTransition(c, cid)) { if (!server.validateCharacteridInTransition(c, cid)) {
@@ -393,7 +388,10 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
if (player.getMap().getHPDec() > 0) player.resetHpDecreaseTask(); if (player.getMap().getHPDec() > 0) player.resetHpDecreaseTask();
player.resetPlayerRates(); player.resetPlayerRates();
if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL == true) player.setPlayerRates(); if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) {
player.setPlayerRates();
}
player.setWorldRates(); player.setWorldRates();
player.updateCouponRates(); player.updateCouponRates();

4
src/main/java/net/server/coordinator/session/Hwid.java
View File

@@ -12,6 +12,10 @@ public record Hwid (String hwid) {
} }
public static Hwid fromClientString(String clientString) throws IllegalArgumentException { public static Hwid fromClientString(String clientString) throws IllegalArgumentException {
if (clientString == null) {
throw new IllegalArgumentException("clientString must not be null");
}
String[] split = clientString.split("_"); String[] split = clientString.split("_");
if (split.length != 2 || split[1].length() != HWID_LENGTH) { if (split.length != 2 || split[1].length() != HWID_LENGTH) {
throw new IllegalArgumentException("Hwid validation failed for hwid: " + clientString); throw new IllegalArgumentException("Hwid validation failed for hwid: " + clientString);

142
src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java
View File

@@ -24,7 +24,6 @@ import client.MapleClient;
import config.YamlConfig; import config.YamlConfig;
import net.server.Server; import net.server.Server;
import net.server.coordinator.login.LoginStorage; import net.server.coordinator.login.LoginStorage;
import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import tools.DatabaseConnection; import tools.DatabaseConnection;
@@ -62,7 +61,7 @@ public class MapleSessionCoordinator {
private final LoginStorage loginStorage = new LoginStorage(); private final LoginStorage loginStorage = new LoginStorage();
private final Map<Integer, MapleClient> onlineClients = new HashMap<>(); // Key: account id private final Map<Integer, MapleClient> onlineClients = new HashMap<>(); // Key: account id
private final Set<String> onlineRemoteHwids = new HashSet<>(); // Hwid/nibblehwid private final Set<String> onlineRemoteHwids = new HashSet<>(); // Hwid/nibblehwid
private final Map<String, Set<IoSession>> loginRemoteHosts = new HashMap<>(); // Key: Ip (+ nibblehwid) private final Map<String, Set<MapleClient>> loginRemoteHosts = new HashMap<>(); // Key: Ip (+ nibblehwid)
private final HostHwidCache hostHwidCache = new HostHwidCache(); private final HostHwidCache hostHwidCache = new HostHwidCache();
private MapleSessionCoordinator() { private MapleSessionCoordinator() {
@@ -93,30 +92,20 @@ public class MapleSessionCoordinator {
return false; return false;
} }
public static String getSessionRemoteAddress(IoSession session) { public static String getSessionRemoteHost(MapleClient client) {
return (String) session.getAttribute(MapleClient.CLIENT_REMOTE_ADDRESS); String nibbleHwid = client.getNibbleHWID();
}
public static String getSessionRemoteHost(IoSession session) {
String nibbleHwid = (String) session.getAttribute(MapleClient.CLIENT_NIBBLEHWID);
if (nibbleHwid != null) { if (nibbleHwid != null) {
return getSessionRemoteAddress(session) + "-" + nibbleHwid; return client.getRemoteAddress() + "-" + nibbleHwid;
} else { } else {
return getSessionRemoteAddress(session); return client.getRemoteAddress();
} }
} }
private static MapleClient getSessionClient(IoSession session) {
return (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);
}
/** /**
* Overwrites any existing online client for the account id, making sure to disconnect it as well. * Overwrites any existing online client for the account id, making sure to disconnect it as well.
*/ */
public void updateOnlineClient(IoSession session) { public void updateOnlineClient(MapleClient client) {
MapleClient client = getSessionClient(session);
if (client != null) { if (client != null) {
int accountId = client.getAccID(); int accountId = client.getAccID();
disconnectClientIfOnline(accountId); disconnectClientIfOnline(accountId);
@@ -131,12 +120,12 @@ public class MapleSessionCoordinator {
} }
} }
public boolean canStartLoginSession(IoSession session) { public boolean canStartLoginSession(MapleClient client) {
if (!YamlConfig.config.server.DETERRED_MULTICLIENT) { if (!YamlConfig.config.server.DETERRED_MULTICLIENT) {
return true; return true;
} }
String remoteHost = getSessionRemoteHost(session); String remoteHost = getSessionRemoteHost(client);
final InitializationResult initResult = sessionInit.initialize(remoteHost); final InitializationResult initResult = sessionInit.initialize(remoteHost);
switch (initResult.getAntiMulticlientResult()) { switch (initResult.getAntiMulticlientResult()) {
case REMOTE_PROCESSING -> { case REMOTE_PROCESSING -> {
@@ -155,28 +144,28 @@ public class MapleSessionCoordinator {
return false; return false;
} }
addLoginRemoteHostSession(remoteHost, session); addLoginRemoteHostClient(remoteHost, client);
return true; return true;
} finally { } finally {
sessionInit.finalize(remoteHost); sessionInit.finalize(remoteHost);
} }
} }
private void addLoginRemoteHostSession(String remoteHost, IoSession session) { private void addLoginRemoteHostClient(String remoteHost, MapleClient client) {
Set<IoSession> sessions = new HashSet<>(2); Set<MapleClient> clients = new HashSet<>(2);
sessions.add(session); clients.add(client);
loginRemoteHosts.put(remoteHost, sessions); loginRemoteHosts.put(remoteHost, clients);
} }
public void closeLoginSession(IoSession session) { public void closeLoginSession(MapleClient client) {
String remoteHost = getSessionRemoteHost(session); String remoteHost = getSessionRemoteHost(client);
removeRemoteHostSession(remoteHost, session); removeRemoteHostClient(remoteHost, client);
String nibbleHwid = (String) session.removeAttribute(MapleClient.CLIENT_NIBBLEHWID); Hwid nibbleHwid = client.getHwid();
client.setHwid(null);
if (nibbleHwid != null) { if (nibbleHwid != null) {
onlineRemoteHwids.remove(nibbleHwid); onlineRemoteHwids.remove(nibbleHwid.hwid());
MapleClient client = getSessionClient(session);
if (client != null) { if (client != null) {
MapleClient loggedClient = onlineClients.get(client.getAccID()); MapleClient loggedClient = onlineClients.get(client.getAccID());
@@ -188,24 +177,24 @@ public class MapleSessionCoordinator {
} }
} }
private void removeRemoteHostSession(String remoteHost, IoSession session) { private void removeRemoteHostClient(String remoteHost, MapleClient client) {
Set<IoSession> sessions = loginRemoteHosts.get(remoteHost); Set<MapleClient> clients = loginRemoteHosts.get(remoteHost);
if (sessions != null) { if (clients != null) {
sessions.remove(session); clients.remove(client);
if (sessions.isEmpty()) { if (clients.isEmpty()) {
loginRemoteHosts.remove(remoteHost); loginRemoteHosts.remove(remoteHost);
} }
} }
} }
public AntiMulticlientResult attemptLoginSession(IoSession session, String nibbleHwid, int accountId, boolean routineCheck) { public AntiMulticlientResult attemptLoginSession(MapleClient client, String nibbleHwid, int accountId, boolean routineCheck) {
if (!YamlConfig.config.server.DETERRED_MULTICLIENT) { if (!YamlConfig.config.server.DETERRED_MULTICLIENT) {
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, nibbleHwid); client.setHwid(new Hwid(nibbleHwid));
return AntiMulticlientResult.SUCCESS; return AntiMulticlientResult.SUCCESS;
} }
String remoteHost = getSessionRemoteHost(session); String remoteHost = getSessionRemoteHost(client);
InitializationResult initResult = sessionInit.initialize(remoteHost); InitializationResult initResult = sessionInit.initialize(remoteHost);
if (initResult != InitializationResult.SUCCESS) { if (initResult != InitializationResult.SUCCESS) {
return initResult.getAntiMulticlientResult(); return initResult.getAntiMulticlientResult();
@@ -222,7 +211,7 @@ public class MapleSessionCoordinator {
return AntiMulticlientResult.REMOTE_REACHED_LIMIT; return AntiMulticlientResult.REMOTE_REACHED_LIMIT;
} }
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, nibbleHwid); client.setHwid(new Hwid(nibbleHwid));
onlineRemoteHwids.add(nibbleHwid); onlineRemoteHwids.add(nibbleHwid);
return AntiMulticlientResult.SUCCESS; return AntiMulticlientResult.SUCCESS;
@@ -231,11 +220,11 @@ public class MapleSessionCoordinator {
} }
} }
public AntiMulticlientResult attemptGameSession(IoSession session, int accountId, String remoteHwid) { public AntiMulticlientResult attemptGameSession(MapleClient client, int accountId, String remoteHwid) {
final String remoteHost = getSessionRemoteHost(session); final String remoteHost = getSessionRemoteHost(client);
if (!YamlConfig.config.server.DETERRED_MULTICLIENT) { if (!YamlConfig.config.server.DETERRED_MULTICLIENT) {
hostHwidCache.addEntry(remoteHost, remoteHwid); hostHwidCache.addEntry(remoteHost, remoteHwid);
hostHwidCache.addEntry(getSessionRemoteAddress(session), remoteHwid); // no HWID information on the loggedin newcomer session... hostHwidCache.addEntry(client.getRemoteAddress(), remoteHwid); // no HWID information on the loggedin newcomer session...
return AntiMulticlientResult.SUCCESS; return AntiMulticlientResult.SUCCESS;
} }
@@ -245,14 +234,14 @@ public class MapleSessionCoordinator {
} }
try { try {
String nibbleHwid = (String) session.getAttribute(MapleClient.CLIENT_NIBBLEHWID); // thanks Paxum for noticing account stuck after PIC failure Hwid nibbleHwid = client.getHwid(); // thanks Paxum for noticing account stuck after PIC failure
if (nibbleHwid == null) { if (nibbleHwid == null) {
return AntiMulticlientResult.REMOTE_NO_MATCH; return AntiMulticlientResult.REMOTE_NO_MATCH;
} }
onlineRemoteHwids.remove(nibbleHwid); onlineRemoteHwids.remove(nibbleHwid);
if (!remoteHwid.endsWith(nibbleHwid)) { if (!remoteHwid.endsWith(nibbleHwid.hwid())) {
return AntiMulticlientResult.REMOTE_NO_MATCH; return AntiMulticlientResult.REMOTE_NO_MATCH;
} else if (onlineRemoteHwids.contains(remoteHwid)) { } else if (onlineRemoteHwids.contains(remoteHwid)) {
return AntiMulticlientResult.REMOTE_LOGGEDIN; return AntiMulticlientResult.REMOTE_LOGGEDIN;
@@ -263,7 +252,7 @@ public class MapleSessionCoordinator {
// updated session CLIENT_HWID attribute will be set when the player log in the game // updated session CLIENT_HWID attribute will be set when the player log in the game
onlineRemoteHwids.add(remoteHwid); onlineRemoteHwids.add(remoteHwid);
hostHwidCache.addEntry(remoteHost, remoteHwid); hostHwidCache.addEntry(remoteHost, remoteHwid);
hostHwidCache.addEntry(getSessionRemoteAddress(session), remoteHwid); hostHwidCache.addEntry(client.getRemoteAddress(), remoteHwid);
associateHwidAccountIfAbsent(remoteHwid, accountId); associateHwidAccountIfAbsent(remoteHwid, accountId);
return AntiMulticlientResult.SUCCESS; return AntiMulticlientResult.SUCCESS;
@@ -290,9 +279,8 @@ public class MapleSessionCoordinator {
} }
} }
private static MapleClient fetchInTransitionSessionClient(IoSession session) { private static MapleClient fetchInTransitionSessionClient(MapleClient client) {
String remoteHwid = MapleSessionCoordinator.getInstance().getGameSessionHwid(session); String remoteHwid = MapleSessionCoordinator.getInstance().getGameSessionHwid(client);
if (remoteHwid == null) { // maybe this session was currently in-transition? if (remoteHwid == null) { // maybe this session was currently in-transition?
return null; return null;
} }
@@ -300,42 +288,46 @@ public class MapleSessionCoordinator {
final int hwidLen = remoteHwid.length(); final int hwidLen = remoteHwid.length();
final boolean isOnlyNibbleHwid = hwidLen <= 8; final boolean isOnlyNibbleHwid = hwidLen <= 8;
if (isOnlyNibbleHwid) { if (isOnlyNibbleHwid) {
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, remoteHwid); client.setHwid(new Hwid(remoteHwid));
} else { } else {
session.setAttribute(MapleClient.CLIENT_HWID, remoteHwid); client.setRemoteHwid(remoteHwid);
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, remoteHwid.substring(hwidLen - 8, hwidLen)); client.setHwid(Hwid.fromClientString(remoteHwid));
} }
MapleClient client = new MapleClient(null, null, session); MapleClient fakeClient = new MapleClient(null, null, null);
Integer chrId = Server.getInstance().freeCharacteridInTransition(client); Integer chrId = Server.getInstance().freeCharacteridInTransition(client);
if (chrId != null) { if (chrId != null) {
try { try {
client.setAccID(MapleCharacter.loadCharFromDB(chrId, client, false).getAccountID()); fakeClient.setAccID(MapleCharacter.loadCharFromDB(chrId, client, false).getAccountID());
} catch (SQLException sqle) { } catch (SQLException sqle) {
sqle.printStackTrace(); sqle.printStackTrace();
} }
} }
session.setAttribute(MapleClient.CLIENT_KEY, client); return fakeClient;
return client;
} }
public void closeSession(IoSession session, Boolean immediately) { public void closeSession(MapleClient client, Boolean immediately) {
MapleClient client = getSessionClient(session);
if (client == null) { if (client == null) {
client = fetchInTransitionSessionClient(session); client = fetchInTransitionSessionClient(client);
} }
String hwid = (String) session.removeAttribute(MapleClient.CLIENT_NIBBLEHWID); // making sure to clean up calls to this function on login phase Hwid hwid = client.getHwid();
// TODO: client.setNibbleHwid(null); client.setHwid(null); // making sure to clean up calls to this function on login phase
onlineRemoteHwids.remove(hwid); if (hwid != null) {
onlineRemoteHwids.remove(hwid.hwid());
}
hwid = (String) session.removeAttribute(MapleClient.CLIENT_HWID); String remoteHwid = client.getRemoteHwid();
client.setRemoteHwid(null);
// TODO: client.setHwid(null); // TODO: client.setHwid(null);
onlineRemoteHwids.remove(hwid); if (remoteHwid != null) {
onlineRemoteHwids.remove(remoteHwid);
}
if (client != null) { if (client != null) {
final boolean isGameSession = hwid != null; final boolean isGameSession = hwid != null || remoteHwid != null;
if (isGameSession) { if (isGameSession) {
onlineClients.remove(client.getAccID()); onlineClients.remove(client.getAccID());
} else { } else {
@@ -347,20 +339,20 @@ public class MapleSessionCoordinator {
} }
} }
} }
if (immediately != null) { if (immediately != null && immediately) {
session.close(immediately); client.closeSession();
} }
} }
public String pickLoginSessionHwid(IoSession session) { public String pickLoginSessionHwid(MapleClient client) {
String remoteHost = getSessionRemoteAddress(session); String remoteHost = client.getRemoteAddress();
// thanks BHB, resinate for noticing players from same network not being able to login // thanks BHB, resinate for noticing players from same network not being able to login
return hostHwidCache.removeEntryAndGetItsHwid(remoteHost); return hostHwidCache.removeEntryAndGetItsHwid(remoteHost);
} }
public String getGameSessionHwid(IoSession session) { public String getGameSessionHwid(MapleClient client) {
String remoteHost = getSessionRemoteHost(session); String remoteHost = getSessionRemoteHost(client);
return hostHwidCache.getEntryHwid(remoteHost); return hostHwidCache.getEntryHwid(remoteHost);
} }
@@ -395,11 +387,11 @@ public class MapleSessionCoordinator {
} }
if (!loginRemoteHosts.isEmpty()) { if (!loginRemoteHosts.isEmpty()) {
List<Entry<String, Set<IoSession>>> elist = new ArrayList<>(loginRemoteHosts.entrySet()); List<Entry<String, Set<MapleClient>>> elist = new ArrayList<>(loginRemoteHosts.entrySet());
elist.sort(Entry.comparingByKey()); elist.sort(Entry.comparingByKey());
System.out.println("Current login sessions: "); System.out.println("Current login sessions: ");
for (Entry<String, Set<IoSession>> e : elist) { for (Entry<String, Set<MapleClient>> e : elist) {
System.out.println(" " + e.getKey() + ", size: " + e.getValue().size()); System.out.println(" " + e.getKey() + ", size: " + e.getValue().size());
} }
} }
@@ -429,12 +421,12 @@ public class MapleSessionCoordinator {
} }
if (!loginRemoteHosts.isEmpty()) { if (!loginRemoteHosts.isEmpty()) {
List<Entry<String, Set<IoSession>>> elist = new ArrayList<>(loginRemoteHosts.entrySet()); List<Entry<String, Set<MapleClient>>> elist = new ArrayList<>(loginRemoteHosts.entrySet());
elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey())); elist.sort((e1, e2) -> e1.getKey().compareTo(e2.getKey()));
str += ("Current login sessions:\r\n"); str += ("Current login sessions:\r\n");
for (Entry<String, Set<IoSession>> e : elist) { for (Entry<String, Set<MapleClient>> e : elist) {
str += (" " + e.getKey() + ", IP: " + e.getValue() + "\r\n"); str += (" " + e.getKey() + ", IP: " + e.getValue() + "\r\n");
} }
} }

2
src/main/java/net/server/handlers/login/AfterLoginHandler.java
View File

@@ -57,7 +57,7 @@ public final class AfterLoginHandler extends AbstractMaplePacketHandler {
c.announce(MaplePacketCreator.requestPinAfterFailure()); c.announce(MaplePacketCreator.requestPinAfterFailure());
} }
} else if (c2 == 0 && c3 == 5) { } else if (c2 == 0 && c3 == 5) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), null); MapleSessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
} }
} }

40
src/main/java/net/server/handlers/login/CharSelectedHandler.java
View File

@@ -22,37 +22,28 @@
package net.server.handlers.login; package net.server.handlers.login;
import client.MapleClient; import client.MapleClient;
import java.net.InetAddress;
import java.net.UnknownHostException;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.Server; import net.server.Server;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.MapleSessionCoordinator; import net.server.coordinator.session.MapleSessionCoordinator;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult;
import net.server.world.World; import net.server.world.World;
import org.apache.mina.core.session.IoSession;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
import java.net.UnknownHostException;
public final class CharSelectedHandler extends AbstractMaplePacketHandler { public final class CharSelectedHandler extends AbstractMaplePacketHandler {
private static int parseAntiMulticlientError(AntiMulticlientResult res) { private static int parseAntiMulticlientError(AntiMulticlientResult res) {
switch (res) { return switch (res) {
case REMOTE_PROCESSING: case REMOTE_PROCESSING -> 10;
return 10; case REMOTE_LOGGEDIN -> 7;
case REMOTE_NO_MATCH -> 17;
case REMOTE_LOGGEDIN: case COORDINATOR_ERROR -> 8;
return 7; default -> 9;
};
case REMOTE_NO_MATCH:
return 17;
case COORDINATOR_ERROR:
return 8;
default:
return 9;
}
} }
@Override @Override
@@ -69,22 +60,21 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler {
c.updateMacs(macs); c.updateMacs(macs);
c.updateHwid(hwid); c.updateHwid(hwid);
IoSession session = c.getSession(); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(session, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) { if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return; return;
} }
if (c.hasBannedMac() || c.hasBannedHWID()) { if (c.hasBannedMac() || c.hasBannedHWID()) {
MapleSessionCoordinator.getInstance().closeSession(session, true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
Server server = Server.getInstance(); Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) { if(!server.haveCharacterEntry(c.getAccID(), charId)) {
MapleSessionCoordinator.getInstance().closeSession(session, true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
@@ -95,7 +85,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler {
return; return;
} }
String[] socket = server.getInetSocket(session, c.getWorld(), c.getChannel()); String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) { if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10)); c.announce(MaplePacketCreator.getAfterLoginError(10));
return; return;

21
src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java
View File

@@ -1,18 +1,17 @@
package net.server.handlers.login; package net.server.handlers.login;
import java.net.InetAddress; import client.MapleClient;
import java.net.UnknownHostException;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.Server; import net.server.Server;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.MapleSessionCoordinator; import net.server.coordinator.session.MapleSessionCoordinator;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult;
import net.server.world.World; import net.server.world.World;
import org.apache.mina.core.session.IoSession;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleClient;
import java.net.InetAddress;
import java.net.UnknownHostException;
public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler {
@@ -50,17 +49,15 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler {
c.updateMacs(macs); c.updateMacs(macs);
c.updateHwid(hwid); c.updateHwid(hwid);
IoSession session = c.getSession();
if (c.hasBannedMac() || c.hasBannedHWID()) { if (c.hasBannedMac() || c.hasBannedHWID()) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
Server server = Server.getInstance(); Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) { if(!server.haveCharacterEntry(c.getAccID(), charId)) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
@@ -72,13 +69,13 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler {
return; return;
} }
String[] socket = server.getInetSocket(session, c.getWorld(), c.getChannel()); String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) { if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10)); c.announce(MaplePacketCreator.getAfterLoginError(10));
return; return;
} }
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(session, c.getAccID(), hwid); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) { if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return; return;

24
src/main/java/net/server/handlers/login/RegisterPicHandler.java
View File

@@ -1,18 +1,17 @@
package net.server.handlers.login; package net.server.handlers.login;
import java.net.InetAddress; import client.MapleClient;
import java.net.UnknownHostException;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.Server; import net.server.Server;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.MapleSessionCoordinator;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult;
import net.server.world.World; import net.server.world.World;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleClient;
import net.server.coordinator.session.MapleSessionCoordinator; import java.net.InetAddress;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; import java.net.UnknownHostException;
import org.apache.mina.core.session.IoSession;
public final class RegisterPicHandler extends AbstractMaplePacketHandler { public final class RegisterPicHandler extends AbstractMaplePacketHandler {
@@ -51,21 +50,20 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
c.updateMacs(macs); c.updateMacs(macs);
c.updateHwid(hwid); c.updateHwid(hwid);
IoSession session = c.getSession(); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(session, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) { if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return; return;
} }
if (c.hasBannedMac() || c.hasBannedHWID()) { if (c.hasBannedMac() || c.hasBannedHWID()) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
Server server = Server.getInstance(); Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) { if(!server.haveCharacterEntry(c.getAccID(), charId)) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
@@ -80,7 +78,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
return; return;
} }
String[] socket = server.getInetSocket(session, c.getWorld(), c.getChannel()); String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) { if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10)); c.announce(MaplePacketCreator.getAfterLoginError(10));
return; return;
@@ -95,7 +93,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
e.printStackTrace(); e.printStackTrace();
} }
} else { } else {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
} }
} }
} }

4
src/main/java/net/server/handlers/login/RegisterPinHandler.java
View File

@@ -35,7 +35,7 @@ public final class RegisterPinHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
byte c2 = slea.readByte(); byte c2 = slea.readByte();
if (c2 == 0) { if (c2 == 0) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), null); MapleSessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
} else { } else {
String pin = slea.readMapleAsciiString(); String pin = slea.readMapleAsciiString();
@@ -43,7 +43,7 @@ public final class RegisterPinHandler extends AbstractMaplePacketHandler {
c.setPin(pin); c.setPin(pin);
c.announce(MaplePacketCreator.pinRegistered()); c.announce(MaplePacketCreator.pinRegistered());
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), null); MapleSessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
} }
} }

2
src/main/java/net/server/handlers/login/SetGenderHandler.java
View File

@@ -44,7 +44,7 @@ public class SetGenderHandler extends AbstractMaplePacketHandler {
Server.getInstance().registerLoginState(c); Server.getInstance().registerLoginState(c);
} else { } else {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), null); MapleSessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
} }
} }

17
src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java
View File

@@ -1,19 +1,19 @@
package net.server.handlers.login; package net.server.handlers.login;
import client.MapleClient; import client.MapleClient;
import java.net.InetAddress;
import java.net.UnknownHostException;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.Server; import net.server.Server;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.MapleSessionCoordinator; import net.server.coordinator.session.MapleSessionCoordinator;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult;
import net.server.world.World; import net.server.world.World;
import org.apache.mina.core.session.IoSession;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.Randomizer; import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
import java.net.UnknownHostException;
public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHandler { public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHandler {
private static int parseAntiMulticlientError(AntiMulticlientResult res) { private static int parseAntiMulticlientError(AntiMulticlientResult res) {
@@ -53,12 +53,11 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
c.updateHwid(hwid); c.updateHwid(hwid);
if (c.hasBannedMac() || c.hasBannedHWID()) { if (c.hasBannedMac() || c.hasBannedHWID()) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
IoSession session = c.getSession(); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(session, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) { if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return; return;
@@ -66,7 +65,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
Server server = Server.getInstance(); Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) { if(!server.haveCharacterEntry(c.getAccID(), charId)) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
@@ -83,7 +82,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
String pic = slea.readMapleAsciiString(); String pic = slea.readMapleAsciiString();
c.setPic(pic); c.setPic(pic);
String[] socket = server.getInetSocket(session, c.getWorld(), channel); String[] socket = server.getInetSocket(c, c.getWorld(), channel);
if (socket == null) { if (socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10)); c.announce(MaplePacketCreator.getAfterLoginError(10));
return; return;

17
src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java
View File

@@ -22,19 +22,19 @@
package net.server.handlers.login; package net.server.handlers.login;
import client.MapleClient; import client.MapleClient;
import java.net.InetAddress;
import java.net.UnknownHostException;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.Server; import net.server.Server;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.MapleSessionCoordinator; import net.server.coordinator.session.MapleSessionCoordinator;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult;
import net.server.world.World; import net.server.world.World;
import org.apache.mina.core.session.IoSession;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.Randomizer; import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
import java.net.UnknownHostException;
public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler { public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler {
private static int parseAntiMulticlientError(AntiMulticlientResult res) { private static int parseAntiMulticlientError(AntiMulticlientResult res) {
@@ -73,12 +73,11 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
c.updateHwid(hwid); c.updateHwid(hwid);
if (c.hasBannedMac() || c.hasBannedHWID()) { if (c.hasBannedMac() || c.hasBannedHWID()) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
IoSession session = c.getSession(); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(session, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) { if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return; return;
@@ -86,7 +85,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
Server server = Server.getInstance(); Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) { if(!server.haveCharacterEntry(c.getAccID(), charId)) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
@@ -106,7 +105,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
c.setChannel(1); c.setChannel(1);
} }
String[] socket = server.getInetSocket(session, c.getWorld(), c.getChannel()); String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) { if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10)); c.announce(MaplePacketCreator.getAfterLoginError(10));
return; return;

25
src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java
View File

@@ -1,19 +1,18 @@
package net.server.handlers.login; package net.server.handlers.login;
import java.net.InetAddress; import client.MapleClient;
import java.net.UnknownHostException;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.Server; import net.server.Server;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.MapleSessionCoordinator;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult;
import net.server.world.World; import net.server.world.World;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.Randomizer; import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleClient;
import net.server.coordinator.session.MapleSessionCoordinator; import java.net.InetAddress;
import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; import java.net.UnknownHostException;
import org.apache.mina.core.session.IoSession;
public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandler { public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandler {
@@ -55,15 +54,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle
c.updateHwid(hwid); c.updateHwid(hwid);
if (c.hasBannedMac() || c.hasBannedHWID()) { if (c.hasBannedMac() || c.hasBannedHWID()) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
IoSession session = c.getSession();
Server server = Server.getInstance(); Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) { if(!server.haveCharacterEntry(c.getAccID(), charId)) {
MapleSessionCoordinator.getInstance().closeSession(c.getSession(), true); MapleSessionCoordinator.getInstance().closeSession(c, true);
return; return;
} }
@@ -78,13 +75,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle
c.setChannel(channel); c.setChannel(channel);
if (c.checkPic(pic)) { if (c.checkPic(pic)) {
String[] socket = server.getInetSocket(session, c.getWorld(), c.getChannel()); String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) { if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10)); c.announce(MaplePacketCreator.getAfterLoginError(10));
return; return;
} }
AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(session, c.getAccID(), hwid); AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) { if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return; return;

2
src/main/java/server/maps/MapleMiniGame.java
View File

@@ -156,7 +156,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
public void broadcastToOwner(final byte[] packet) { public void broadcastToOwner(final byte[] packet) {
MapleClient c = owner.getClient(); MapleClient c = owner.getClient();
if (c != null && c.getSession() != null) { if (c != null) {
c.announce(packet); c.announce(packet);
} }
} }

5
src/main/java/server/maps/MaplePlayerShop.java
View File

@@ -386,8 +386,9 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
} }
public void broadcast(final byte[] packet) { public void broadcast(final byte[] packet) {
if (owner.getClient() != null && owner.getClient().getSession() != null) { MapleClient client = owner.getClient();
owner.getClient().announce(packet); if (client != null) {
client.announce(packet);
} }
broadcastToVisitors(packet); broadcastToVisitors(packet);
} }