From 11d0f82b865013eef49b26ab82051089e0f70cd5 Mon Sep 17 00:00:00 2001 From: Corey Shupe Date: Tue, 19 Oct 2021 04:11:04 -0400 Subject: [PATCH] Make Mojang SessionServer Configurable (#499) --- .../packet/client/login/EncryptionResponsePacket.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java b/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java index 39471613f..635a55b55 100644 --- a/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.UUID; public class EncryptionResponsePacket implements ClientPreplayPacket { + private static final String MOJANG_AUTH_URL = System.getProperty("minestom.auth.url", "https://sessionserver.mojang.com/session/minecraft/hasJoined").concat("?username=%s&serverId=%s"); private static final Gson GSON = new Gson(); private byte[] sharedSecret; private byte[] verifyToken; @@ -64,9 +65,7 @@ public class EncryptionResponsePacket implements ClientPreplayPacket { final String serverId = new BigInteger(digestedData).toString(16); final String username = URLEncoder.encode(loginUsername, StandardCharsets.UTF_8); - final String url = "https://sessionserver.mojang.com/session/minecraft/hasJoined?" - + "username=" + username + "&" - + "serverId=" + serverId; + final String url = String.format(MOJANG_AUTH_URL, username, serverId); // TODO: Add ability to add ip query tag. See: https://wiki.vg/Protocol_Encryption#Authentication final HttpClient client = HttpClient.newHttpClient();