2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-07 08:39:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #358 from kylestev/fix/add-login-decoder-login

Browse Source 
Add logging to LoginDecoder for session rejections
This commit is contained in:
Gary Tierney
2017-09-18 21:38:49 +01:00
committed by GitHub
parent ec88b54ae6 1537aa8b93
commit c94019d6da
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/main/org/apollo/net/codec/login/LoginDecoder.java
+12
View File
@@ -9,6 +9,7 @@ import java.math.BigInteger;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import org.apollo.cache.FileSystemConstants; import org.apollo.cache.FileSystemConstants;
import org.apollo.net.NetworkConstants; import org.apollo.net.NetworkConstants;
@@ -27,6 +28,11 @@ import com.google.common.net.InetAddresses;
*/ */
public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState> { public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState> {
/**
* The logger for this class.
*/
private static final Logger logger = Logger.getLogger(LoginDecoder.class.getName());
/** /**
* The secure random number generator. * The secure random number generator.
*/ */
@@ -110,6 +116,7 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
int type = buffer.readUnsignedByte(); int type = buffer.readUnsignedByte();
if (type != LoginConstants.TYPE_STANDARD && type != LoginConstants.TYPE_RECONNECTION) { if (type != LoginConstants.TYPE_STANDARD && type != LoginConstants.TYPE_RECONNECTION) {
logger.fine("Failed to decode login header.");
writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION);
return; return;
} }
@@ -137,6 +144,7 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
int memoryStatus = payload.readUnsignedByte(); int memoryStatus = payload.readUnsignedByte();
if (memoryStatus != 0 && memoryStatus != 1) { if (memoryStatus != 0 && memoryStatus != 1) {
logger.fine("Login memoryStatus (" + memoryStatus + ") not in expected range of [0, 1].");
writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION);
return; return;
} }
@@ -150,6 +158,7 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
int length = payload.readUnsignedByte(); int length = payload.readUnsignedByte();
if (length != loginLength - 41) { if (length != loginLength - 41) {
logger.fine("Login packet unexpected length (" + length + ")");
writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION);
return; return;
} }
@@ -162,6 +171,7 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
int id = secure.readUnsignedByte(); int id = secure.readUnsignedByte();
if (id != 10) { if (id != 10) {
logger.fine("Unable to read id from secure payload.");
writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION);
return; return;
} }
@@ -169,6 +179,7 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
long clientSeed = secure.readLong(); long clientSeed = secure.readLong();
long reportedSeed = secure.readLong(); long reportedSeed = secure.readLong();
if (reportedSeed != serverSeed) { if (reportedSeed != serverSeed) {
logger.fine("Reported seed differed from server seed.");
writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION);
return; return;
} }
@@ -180,6 +191,7 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
String hostAddress = InetAddresses.toAddrString(socketAddress.getAddress()); String hostAddress = InetAddresses.toAddrString(socketAddress.getAddress());
if (password.length() < 6 || password.length() > 20 || username.isEmpty() || username.length() > 12) { if (password.length() < 6 || password.length() > 20 || username.isEmpty() || username.length() > 12) {
logger.fine("Username ('" + username + "') or password did not pass validation.");
writeResponseCode(ctx, LoginConstants.STATUS_INVALID_CREDENTIALS); writeResponseCode(ctx, LoginConstants.STATUS_INVALID_CREDENTIALS);
return; return;
} }