Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-31 21:48:08 +01:00
Code Issues Projects Releases Wiki Activity

Stop using authlib

Browse Source
This commit is contained in:
Articdive 2021-02-22 17:05:41 +01:00
parent 20a23a4ebc
commit de3443f173
No known key found for this signature in database
GPG Key ID: B069585F0F7D90DE
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -135,7 +135,6 @@ dependencies {
// Guava 21.0+ required for Mixin, but Authlib imports 17.0
api 'com.google.guava:guava:21.0'
api 'com.mojang:authlib:1.5.21'
// Code modification
api "org.ow2.asm:asm:${asmVersion}"

18
src/main/java/net/minestom/server/extras/MojangAuth.java
View File

@ -1,14 +1,10 @@
package net.minestom.server.extras;
import com.mojang.authlib.AuthenticationService;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
import net.minestom.server.MinecraftServer;
import net.minestom.server.extras.mojangAuth.MojangCrypt;
import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.Nullable;
import java.net.Proxy;
import java.security.KeyPair;
public final class MojangAuth {
@ -16,8 +12,6 @@ public final class MojangAuth {
private static volatile boolean enabled = false;
private static KeyPair keyPair;
private static AuthenticationService authService;
private static MinecraftSessionService sessionService;
/**
* Enables mojang authentication on the server.
@ -32,8 +26,6 @@ public final class MojangAuth {
// Generate necessary fields...
keyPair = MojangCrypt.generateKeyPair();
authService = new YggdrasilAuthenticationService(Proxy.NO_PROXY, "");
sessionService = authService.createMinecraftSessionService();
}
public static boolean isEnabled() {
@ -44,14 +36,4 @@ public final class MojangAuth {
public static KeyPair getKeyPair() {
return keyPair;
}
@Nullable
public static AuthenticationService getAuthService() {
return authService;
}
@Nullable
public static MinecraftSessionService getSessionService() {
return sessionService;
}
}

35
src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java
View File

@ -1,7 +1,7 @@
package net.minestom.server.network.packet.client.login;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import net.minestom.server.MinecraftServer;
import net.minestom.server.data.type.array.ByteArrayData;
import net.minestom.server.extras.MojangAuth;
@ -14,11 +14,16 @@ import net.minestom.server.utils.binary.BinaryReader;
import org.jetbrains.annotations.NotNull;
import javax.crypto.SecretKey;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.math.BigInteger;
import java.net.URL;
import java.util.Arrays;
import java.util.UUID;
public class EncryptionResponsePacket implements ClientPreplayPacket {
private static final Gson GSON = new Gson();
private byte[] sharedSecret;
private byte[] verifyToken;
@ -38,7 +43,7 @@ public class EncryptionResponsePacket implements ClientPreplayPacket {
MinecraftServer.LOGGER.error("{} tried to login with an invalid nonce!", loginUsername);
return;
}
if (!loginUsername.isEmpty()) {
if (loginUsername != null && !loginUsername.isEmpty()) {
final byte[] digestedData = MojangCrypt.digestData("", MojangAuth.getKeyPair().getPublic(), getSecretKey());
@ -49,14 +54,24 @@ public class EncryptionResponsePacket implements ClientPreplayPacket {
return;
}
final String string3 = new BigInteger(digestedData).toString(16);
final GameProfile gameProfile = MojangAuth.getSessionService().hasJoinedServer(new GameProfile(null, loginUsername), string3);
nettyConnection.setEncryptionKey(getSecretKey());
// Query Mojang's sessionserver.
final String serverId = new BigInteger(digestedData).toString(16);
InputStream gameProfileStream = new URL(
"https://sessionserver.mojang.com/session/minecraft/hasJoined?"
+ "username=" + loginUsername + "&"
+ "serverId=" + serverId
// TODO: Add ability to add ip query tag. See: https://wiki.vg/Protocol_Encryption#Authentication
).openStream();
MinecraftServer.LOGGER.info("UUID of player {} is {}", loginUsername, gameProfile.getId());
CONNECTION_MANAGER.startPlayState(connection, gameProfile.getId(), gameProfile.getName(), true);
final JsonObject gameProfile = GSON.fromJson(new InputStreamReader(gameProfileStream), JsonObject.class);
nettyConnection.setEncryptionKey(getSecretKey());
UUID profileUUID = UUID.fromString(gameProfile.get("id").getAsString().replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
String profileName = gameProfile.get("name").getAsString();
MinecraftServer.LOGGER.info("UUID of player {} is {}", loginUsername, profileUUID);
CONNECTION_MANAGER.startPlayState(connection, profileUUID, profileName, true);
}
} catch (AuthenticationUnavailableException e) {
} catch (IOException e) {
MinecraftServer.getExceptionManager().handleException(e);
}
});