feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Fix using asynchronous manager in synchronous mode

Browse Source
This commit is contained in:
games647
2022-07-25 16:36:10 +02:00
parent a8f3155fc5
commit 155c98d601
5 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
View File

@ -25,7 +25,6 @@
*/ */
package com.github.games647.fastlogin.bukkit; package com.github.games647.fastlogin.bukkit;
import com.comphenix.protocol.ProtocolLibrary;
import com.github.games647.fastlogin.bukkit.command.CrackedCommand; import com.github.games647.fastlogin.bukkit.command.CrackedCommand;
import com.github.games647.fastlogin.bukkit.command.PremiumCommand; import com.github.games647.fastlogin.bukkit.command.PremiumCommand;
import com.github.games647.fastlogin.bukkit.listener.ConnectionListener; import com.github.games647.fastlogin.bukkit.listener.ConnectionListener;
@ -164,9 +163,9 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
} else { } else {
logger.warn("We have detected that you are running FastLogin alongside Floodgate and ProtocolLib."); logger.warn("We have detected that you are running FastLogin alongside Floodgate and ProtocolLib.");
logger.warn("Currently there is an issue with FastLogin that prevents Floodgate name prefixes from " logger.warn("Currently there is an issue with FastLogin that prevents Floodgate name prefixes from "
+ "showing up when it is together used with ProtocolLib."); + "showing up when it is together used with ProtocolLib.");
logger.warn("If you would like to use Floodgate name prefixes, you can enable an experimental " logger.warn("If you would like to use Floodgate name prefixes, you can enable an experimental "
+ "workaround by changing the value 'floodgatePrefixWorkaround' to true in config.yml."); + "workaround by changing the value 'floodgatePrefixWorkaround' to true in config.yml.");
logger.warn("For more information visit https://github.com/games647/FastLogin/issues/493"); logger.warn("For more information visit https://github.com/games647/FastLogin/issues/493");
} }
} }
@ -208,9 +207,9 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
} }
} }
if (isPluginInstalled("ProtocolLib")) { // if (isPluginInstalled("ProtocolLib")) {
ProtocolLibrary.getProtocolManager().getAsynchronousManager().unregisterAsyncHandlers(this); // ProtocolLibrary.getProtocolManager().getAsynchronousManager().unregisterAsyncHandlers(this);
} // }
} }
public FastLoginCore<Player, CommandSender, FastLoginBukkit> getCore() { public FastLoginCore<Player, CommandSender, FastLoginBukkit> getCore() {

9
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ManualNameChange.java
View File

@ -25,7 +25,6 @@
*/ */
package com.github.games647.fastlogin.bukkit.listener.protocollib; package com.github.games647.fastlogin.bukkit.listener.protocollib;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.events.PacketEvent;
@ -62,10 +61,10 @@ public class ManualNameChange extends PacketAdapter {
public static void register(FastLoginBukkit plugin, FloodgateService floodgate) { public static void register(FastLoginBukkit plugin, FloodgateService floodgate) {
// they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError // they will be created with a static builder, because otherwise it will throw a NoClassDefFoundError
ProtocolLibrary.getProtocolManager() // ProtocolLibrary.getProtocolManager()
.getAsynchronousManager() // .getAsynchronousManager()
.registerAsyncHandler(new ManualNameChange(plugin, floodgate)) // .registerAsyncHandler(new ManualNameChange(plugin, floodgate))
.start(); // .start();
} }
@Override @Override

19
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
View File

@ -25,7 +25,6 @@
*/ */
package com.github.games647.fastlogin.bukkit.listener.protocollib; package com.github.games647.fastlogin.bukkit.listener.protocollib;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.events.PacketEvent;
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;
@ -42,7 +41,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class NameCheckTask extends JoinManagement<Player, CommandSender, ProtocolLibLoginSource> public class NameCheckTask extends JoinManagement<Player, CommandSender, ProtocolLibLoginSource>
implements Runnable { implements Runnable {
private final FastLoginBukkit plugin; private final FastLoginBukkit plugin;
private final PacketEvent packetEvent; private final PacketEvent packetEvent;
@ -70,11 +69,11 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
@Override @Override
public void run() { public void run() {
try { // try {
super.onLogin(username, new ProtocolLibLoginSource(player, random, serverKey, clientKey)); super.onLogin(username, new ProtocolLibLoginSource(player, random, serverKey, clientKey));
} finally { // } finally {
ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent); // ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent);
} // }
} }
@Override @Override
@ -106,9 +105,9 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
BukkitLoginSession playerSession = new BukkitLoginSession(username, verify, clientKey, registered, profile); BukkitLoginSession playerSession = new BukkitLoginSession(username, verify, clientKey, registered, profile);
plugin.putSession(player.getAddress(), playerSession); plugin.putSession(player.getAddress(), playerSession);
//cancel only if the player has a paid account otherwise login as normal offline player //cancel only if the player has a paid account otherwise login as normal offline player
synchronized (packetEvent.getAsyncMarker().getProcessingLock()) { // synchronized (packetEvent.getAsyncMarker().getProcessingLock()) {
packetEvent.setCancelled(true); packetEvent.setCancelled(true);
} // }
} }
@Override @Override

10
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
View File

@ -152,12 +152,13 @@ public class ProtocolLibListener extends PacketAdapter {
} else { } else {
byte[] expectedVerifyToken = session.getVerifyToken(); byte[] expectedVerifyToken = session.getVerifyToken();
if (verifyNonce(sender, packetEvent.getPacket(), session.getClientPublicKey(), expectedVerifyToken)) { if (verifyNonce(sender, packetEvent.getPacket(), session.getClientPublicKey(), expectedVerifyToken)) {
packetEvent.getAsyncMarker().incrementProcessingDelay(); // packetEvent.getAsyncMarker().incrementProcessingDelay();
Runnable verifyTask = new VerifyResponseTask( Runnable verifyTask = new VerifyResponseTask(
plugin, packetEvent, sender, session, sharedSecret, keyPair plugin, packetEvent, sender, session, sharedSecret, keyPair
); );
plugin.getScheduler().runAsync(verifyTask); verifyTask.run();
// plugin.getScheduler().runAsync(verifyTask);
} else { } else {
sender.kickPlayer(plugin.getCore().getMessage("invalid-verify-token")); sender.kickPlayer(plugin.getCore().getMessage("invalid-verify-token"));
} }
@ -229,11 +230,12 @@ public class ProtocolLibListener extends PacketAdapter {
plugin.getLog().trace("GameProfile {} with {} connecting", sessionKey, username); plugin.getLog().trace("GameProfile {} with {} connecting", sessionKey, username);
packetEvent.getAsyncMarker().incrementProcessingDelay(); // packetEvent.getAsyncMarker().incrementProcessingDelay();
Runnable nameCheckTask = new NameCheckTask( Runnable nameCheckTask = new NameCheckTask(
plugin, random, player, packetEvent, username, clientKey.orElse(null), keyPair.getPublic() plugin, random, player, packetEvent, username, clientKey.orElse(null), keyPair.getPublic()
); );
plugin.getScheduler().runAsync(nameCheckTask); // plugin.getScheduler().runAsync(nameCheckTask);
nameCheckTask.run();
} }
private Optional<ClientPublicKey> verifyPublicKey(WrappedProfileKeyData profileKey) { private Optional<ClientPublicKey> verifyPublicKey(WrappedProfileKeyData profileKey) {

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

@ -74,7 +74,7 @@ public class VerifyResponseTask implements Runnable {
static { static {
ENCRYPTION_CLASS = MinecraftReflection.getMinecraftClass( ENCRYPTION_CLASS = MinecraftReflection.getMinecraftClass(
"util." + ENCRYPTION_CLASS_NAME, ENCRYPTION_CLASS_NAME "util." + ENCRYPTION_CLASS_NAME, ENCRYPTION_CLASS_NAME
); );
} }
@ -108,11 +108,11 @@ public class VerifyResponseTask implements Runnable {
verifyResponse(session); verifyResponse(session);
} finally { } finally {
//this is a fake packet; it shouldn't be sent to the server //this is a fake packet; it shouldn't be sent to the server
synchronized (packetEvent.getAsyncMarker().getProcessingLock()) { // synchronized (packetEvent.getAsyncMarker().getProcessingLock()) {
packetEvent.setCancelled(true); packetEvent.setCancelled(true);
} // }
ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent); // ProtocolLibrary.getProtocolManager().getAsynchronousManager().signalPacketTransmission(packetEvent);
} }
} }
@ -149,9 +149,9 @@ public class VerifyResponseTask implements Runnable {
} else { } else {
//user tried to fake an authentication //user tried to fake an authentication
disconnect( disconnect(
"invalid-session", "invalid-session",
"GameProfile {} ({}) tried to log in with an invalid session. ServerId: {}", "GameProfile {} ({}) tried to log in with an invalid session. ServerId: {}",
session.getRequestUsername(), socketAddress, serverId session.getRequestUsername(), socketAddress, serverId
); );
} }
} catch (IOException ioEx) { } catch (IOException ioEx) {
@ -217,15 +217,15 @@ public class VerifyResponseTask implements Runnable {
try { try {
// Try to get the old (pre MC 1.16.4) encryption method // Try to get the old (pre MC 1.16.4) encryption method
encryptMethod = FuzzyReflection.fromClass(networkManagerClass) encryptMethod = FuzzyReflection.fromClass(networkManagerClass)
.getMethodByParameters("a", SecretKey.class); .getMethodByParameters("a", SecretKey.class);
} catch (IllegalArgumentException exception) { } catch (IllegalArgumentException exception) {
// Get the new encryption method // Get the new encryption method
encryptMethod = FuzzyReflection.fromClass(networkManagerClass) encryptMethod = FuzzyReflection.fromClass(networkManagerClass)
.getMethodByParameters("a", Cipher.class, Cipher.class); .getMethodByParameters("a", Cipher.class, Cipher.class);
// Get the needed Cipher helper method (used to generate ciphers from login key) // Get the needed Cipher helper method (used to generate ciphers from login key)
cipherMethod = FuzzyReflection.fromClass(ENCRYPTION_CLASS) cipherMethod = FuzzyReflection.fromClass(ENCRYPTION_CLASS)
.getMethodByParameters("a", int.class, Key.class); .getMethodByParameters("a", int.class, Key.class);
} }
} }
@ -277,7 +277,7 @@ public class VerifyResponseTask implements Runnable {
EquivalentConverter<WrappedProfileKeyData> converter = BukkitConverters.getWrappedPublicKeyDataConverter(); EquivalentConverter<WrappedProfileKeyData> converter = BukkitConverters.getWrappedPublicKeyDataConverter();
val wrappedKey = Optional.ofNullable(clientKey).map(key -> val wrappedKey = Optional.ofNullable(clientKey).map(key ->
new WrappedProfileKeyData(clientKey.expiry(), clientKey.key(), clientKey.signature()) new WrappedProfileKeyData(clientKey.expiry(), clientKey.key(), clientKey.signature())
); );
startPacket.getOptionals(converter).write(0, wrappedKey); startPacket.getOptionals(converter).write(0, wrappedKey);