PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Add messages to state checks

Browse Source
This commit is contained in:
md_5 2013-02-08 16:23:49 +11:00
parent 48447addba
commit 1bc4316e0a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/src/main/java/net/md_5/bungee/InitialHandler.java
View File

@ -5,7 +5,6 @@ import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import lombok.Getter; import lombok.Getter;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
@ -86,7 +85,7 @@ public class InitialHandler extends PacketHandler implements Runnable, PendingCo
@Override @Override
public void handle(Packet2Handshake handshake) throws Exception public void handle(Packet2Handshake handshake) throws Exception
{ {
Preconditions.checkState(thisState == State.HANDSHAKE); Preconditions.checkState(thisState == State.HANDSHAKE, "Not expecting HANDSHAKE");
this.handshake = handshake; this.handshake = handshake;
request = EncryptionUtil.encryptRequest(); request = EncryptionUtil.encryptRequest();
out.write(request.getPacket()); out.write(request.getPacket());
@ -96,7 +95,7 @@ public class InitialHandler extends PacketHandler implements Runnable, PendingCo
@Override @Override
public void handle(PacketFCEncryptionResponse encryptResponse) throws Exception public void handle(PacketFCEncryptionResponse encryptResponse) throws Exception
{ {
Preconditions.checkState(thisState == State.ENCRYPT); Preconditions.checkState(thisState == State.ENCRYPT, "Not expecting ENCRYPT");
SecretKey shared = EncryptionUtil.getSecret(encryptResponse, request); SecretKey shared = EncryptionUtil.getSecret(encryptResponse, request);
if (!EncryptionUtil.isAuthenticated(handshake.username, request.serverId, shared)) if (!EncryptionUtil.isAuthenticated(handshake.username, request.serverId, shared))
@ -128,7 +127,7 @@ public class InitialHandler extends PacketHandler implements Runnable, PendingCo
@Override @Override
public void handle(PacketCDClientStatus clientStatus) throws Exception public void handle(PacketCDClientStatus clientStatus) throws Exception
{ {
Preconditions.checkState(thisState == State.LOGIN); Preconditions.checkState(thisState == State.LOGIN, "Not expecting LOGIN");
UserConnection userCon = new UserConnection(socket, this, in, out, handshake); UserConnection userCon = new UserConnection(socket, this, in, out, handshake);
String server = ProxyServer.getInstance().getReconnectHandler().getServer(userCon); String server = ProxyServer.getInstance().getReconnectHandler().getServer(userCon);