TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 10:47:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make encryption method reflections static

Browse Source
This commit is contained in:
Kamilkime
2020-11-08 17:15:26 +01:00
parent 64072d84d8
commit 71d84d1748
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
View File

@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.injector.server.TemporaryPlayerFactory; import com.comphenix.protocol.injector.server.TemporaryPlayerFactory;
import com.comphenix.protocol.reflect.FieldUtils; import com.comphenix.protocol.reflect.FieldUtils;
import com.comphenix.protocol.reflect.FuzzyReflection; import com.comphenix.protocol.reflect.FuzzyReflection;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.wrappers.WrappedChatComponent; import com.comphenix.protocol.wrappers.WrappedChatComponent;
import com.comphenix.protocol.wrappers.WrappedGameProfile; import com.comphenix.protocol.wrappers.WrappedGameProfile;
import com.github.games647.craftapi.model.auth.Verification; import com.github.games647.craftapi.model.auth.Verification;
@ -13,7 +14,6 @@ import com.github.games647.craftapi.model.skin.SkinProperty;
import com.github.games647.craftapi.resolver.MojangResolver; import com.github.games647.craftapi.resolver.MojangResolver;
import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
import com.github.games647.fastlogin.bukkit.FastLoginBukkit; import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import javax.crypto.Cipher; import javax.crypto.Cipher;
@ -44,6 +44,9 @@ public class VerifyResponseTask implements Runnable {
private final byte[] sharedSecret; private final byte[] sharedSecret;
private static Method encryptMethod;
private static Method cipherMethod;
public VerifyResponseTask(FastLoginBukkit plugin, PacketEvent packetEvent, Player player, public VerifyResponseTask(FastLoginBukkit plugin, PacketEvent packetEvent, Player player,
byte[] sharedSecret, KeyPair keyPair) { byte[] sharedSecret, KeyPair keyPair) {
this.plugin = plugin; this.plugin = plugin;
@ -172,33 +175,31 @@ public class VerifyResponseTask implements Runnable {
} }
private boolean enableEncryption(SecretKey loginKey) throws IllegalArgumentException { private boolean enableEncryption(SecretKey loginKey) throws IllegalArgumentException {
try { if (encryptMethod == null) {
//get the NMS connection handle of this player Class<?> networkManagerClass = MinecraftReflection.getNetworkManagerClass();
Object networkManager = getNetworkManager();
try { try {
//try to detect the method by parameters encryptMethod = FuzzyReflection.fromClass(networkManagerClass)
Method encryptMethod = FuzzyReflection .getMethodByParameters("a", SecretKey.class);
.fromObject(networkManager).getMethodByParameters("a", SecretKey.class); } catch (IllegalArgumentException exception) {
encryptMethod = FuzzyReflection.fromClass(networkManagerClass)
.getMethodByParameters("a", Cipher.class, Cipher.class);
//encrypt/decrypt following packets Class<?> encryptionClass = MinecraftReflection.getMinecraftClass("MinecraftEncryption");
//the client expects this behaviour cipherMethod = FuzzyReflection.fromClass(encryptionClass)
.getMethodByParameters("a", int.class, Key.class);
}
}
try {
Object networkManager = this.getNetworkManager();
if (cipherMethod == null) {
encryptMethod.invoke(networkManager, loginKey); encryptMethod.invoke(networkManager, loginKey);
} catch (Exception ex) { } else {
//try to detect the method by parameters
Method encryptMethod = FuzzyReflection
.fromObject(networkManager).getMethodByParameters("a", Cipher.class, Cipher.class);
//change Key instance into two Cipher instances
String ver = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
Class<?> encryptionClass = Class.forName("net.minecraft.server." + ver + ".MinecraftEncryption");
Method cipherMethod = encryptionClass.getMethod("a", int.class, Key.class);
Object cipher = cipherMethod.invoke(null, 2, loginKey); Object cipher = cipherMethod.invoke(null, 2, loginKey);
Object cipher1 = cipherMethod.invoke(null, 1, loginKey); Object cipher1 = cipherMethod.invoke(null, 1, loginKey);
//encrypt/decrypt following packets
//the client expects this behaviour
encryptMethod.invoke(networkManager, cipher, cipher1); encryptMethod.invoke(networkManager, cipher, cipher1);
} }
} catch (Exception ex) { } catch (Exception ex) {