mmo-ref/mc-velocity
1
0
Fork 0
mirror of https://github.com/PaperMC/Velocity synced 2026-08-18 22:23:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Setup encryption before possible disconnect (#1754)

Browse source
This commit is contained in:
Wouter Gritter 2026-07-11 22:09:03 +02:00 • committed by GitHub
parent 729a050662
commit b8d1f16b07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java
View file

@ -200,8 +200,12 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
}
byte[] decryptedSharedSecret = decryptRsa(serverKeyPair, packet.getSharedSecret());
String serverId = generateServerId(decryptedSharedSecret, serverKeyPair.getPublic());
// Go ahead and enable encryption. Once the client sends EncryptionResponse, encryption
// is enabled.
mcConnection.enableEncryption(decryptedSharedSecret);
String serverId = generateServerId(decryptedSharedSecret, serverKeyPair.getPublic());
String playerIp = ((InetSocketAddress) mcConnection.getRemoteAddress()).getHostString();
String url = String.format(MOJANG_HASJOINED_URL,
urlFormParameterEscaper().escape(login.getUsername()), serverId);
@ -230,18 +234,6 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
return;
}
// Go ahead and enable encryption. Once the client sends EncryptionResponse, encryption
// is enabled.
try {
mcConnection.enableEncryption(decryptedSharedSecret);
} catch (GeneralSecurityException e) {
logger.error("Unable to enable encryption for connection", e);
// At this point, the connection is encrypted, but something's wrong on our side and
// we can't do anything about it.
mcConnection.close(true);
return;
}
if (response.statusCode() == 200) {
final GameProfile profile = GENERAL_GSON.fromJson(response.body(),
GameProfile.class);