PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Update to latest snapshot.

Browse Source
This commit is contained in:
md_5
2013-09-28 17:03:18 +10:00
parent edc5b4dc91
commit 96acdb97fd
8 changed files with 107 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@@ -357,4 +357,10 @@ public final class UserConnection implements ProxiedPlayer
{
return unsafe;
}
@Override
public String getUUID()
{
return getPendingConnection().getUUID();
}
}

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

@@ -1,6 +1,8 @@
package net.md_5.bungee.connection;
import com.google.common.base.Preconditions;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import io.netty.util.concurrent.ScheduledFuture;
import java.math.BigInteger;
import java.net.InetSocketAddress;
@@ -86,6 +88,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private ScheduledFuture<?> pingFuture;
private InetSocketAddress vHost;
private byte version = -1;
@Getter
private String UUID;
private enum State
{
@@ -250,18 +254,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( this.onlineMode )
{
String encName = URLEncoder.encode( InitialHandler.this.getName(), "UTF-8" );
String encID = URLEncoder.encode( InitialHandler.this.request.getServerId(), "UTF-8" );
MessageDigest sha = MessageDigest.getInstance( "SHA-1" );
for ( byte[] bit : new byte[][]
{
request.getServerId().getBytes( "ISO_8859_1" ), sharedKey.getEncoded(), EncryptionUtil.keys.getPublic().getEncoded()
} )
{
sha.update( bit );
}
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
String authURL = "http://session.minecraft.net/game/checkserver.jsp?user=" + encName + "&serverId=" + encodedHash;
String authURL = "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=" + encName + "&serverId=" + encID;
Callback<String> handler = new Callback<String>()
{
@@ -270,13 +265,18 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( error == null )
{
if ( "YES".equals( result ) )
JsonObject obj = BungeeCord.getInstance().gson.fromJson( result, JsonObject.class );
if ( obj != null )
{
finish();
} else
{
disconnect( "Not authenticated with Minecraft.net" );
JsonElement id = obj.get( "id" );
if ( id != null )
{
UUID = id.getAsString();
finish();
return;
}
}
disconnect( "Not authenticated with Minecraft.net" );
} else
{
disconnect( bungee.getTranslation( "mojang_fail" ) );

29
proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
View File

@@ -36,7 +36,15 @@ public class HttpHandler extends SimpleChannelInboundHandler<HttpObject>
if ( msg instanceof HttpResponse )
{
HttpResponse response = (HttpResponse) msg;
if ( response.getStatus().code() != 200 )
int responseCode = response.getStatus().code();
if ( responseCode == HttpResponseStatus.NO_CONTENT.code() )
{
done( ctx );
return;
}
if ( responseCode != HttpResponseStatus.OK.code() )
{
throw new IllegalStateException( "Expected HTTP response 200 OK, got " + response.getStatus() );
}
@@ -48,14 +56,19 @@ public class HttpHandler extends SimpleChannelInboundHandler<HttpObject>
if ( msg instanceof LastHttpContent )
{
try
{
callback.done( buffer.toString(), null );
} finally
{
ctx.channel().close();
}
done( ctx );
}
}
}
private void done(ChannelHandlerContext ctx)
{
try
{
callback.done( buffer.toString(), null );
} finally
{
ctx.channel().close();
}
}
}