Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-03 22:12:20 +01:00
Code Issues Projects Releases Wiki Activity

Add EncryptionContext

Browse Source
This commit is contained in:
themode 2022-02-20 12:58:09 +01:00
parent e7253488c6
commit a15156aeb4
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
View File

@ -5,6 +5,7 @@ import net.minestom.server.MinecraftServer;
import net.minestom.server.adventure.MinestomAdventure;
import net.minestom.server.entity.Player;
import net.minestom.server.entity.PlayerSkin;
import net.minestom.server.event.EventDispatcher;
import net.minestom.server.event.ListenerHandle;
import net.minestom.server.event.player.PlayerPacketOutEvent;
import net.minestom.server.extras.mojangAuth.MojangCrypt;
@ -51,13 +52,11 @@ public class PlayerSocketConnection extends PlayerConnection {
private final SocketChannel channel;
private SocketAddress remoteAddress;
private volatile boolean encrypted = false;
private volatile boolean compressed = false;
//Could be null. Only used for Mojang Auth
private volatile EncryptionContext encryptionContext;
private byte[] nonce = new byte[4];
private Cipher decryptCipher;
private Cipher encryptCipher;
// Data from client packets
private String loginUsername;
@ -77,7 +76,7 @@ public class PlayerSocketConnection extends PlayerConnection {
private final AtomicReference<BinaryBuffer> tickBuffer = new AtomicReference<>(PooledBuffers.get());
private volatile BinaryBuffer cacheBuffer;
private final ListenerHandle<PlayerPacketOutEvent> outgoing = MinecraftServer.getGlobalEventHandler().getHandle(PlayerPacketOutEvent.class);
private final ListenerHandle<PlayerPacketOutEvent> outgoing = EventDispatcher.getHandle(PlayerPacketOutEvent.class);
public PlayerSocketConnection(@NotNull Worker worker, @NotNull SocketChannel channel, SocketAddress remoteAddress) {
super();
@ -91,16 +90,18 @@ public class PlayerSocketConnection extends PlayerConnection {
public void processPackets(BinaryBuffer readBuffer, PacketProcessor packetProcessor) {
// Decrypt data
if (encrypted) {
final Cipher cipher = decryptCipher;
{
final EncryptionContext encryptionContext = this.encryptionContext;
if (encryptionContext != null) {
ByteBuffer input = readBuffer.asByteBuffer(0, readBuffer.writerOffset());
try {
cipher.update(input, input.duplicate());
encryptionContext.decrypt().update(input, input.duplicate());
} catch (ShortBufferException e) {
MinecraftServer.getExceptionManager().handleException(e);
return;
}
}
}
// Read all packets
try {
this.cacheBuffer = PacketUtils.readPackets(readBuffer, compressed,
@ -136,10 +137,8 @@ public class PlayerSocketConnection extends PlayerConnection {
* @throws IllegalStateException if encryption is already enabled for this connection
*/
public void setEncryptionKey(@NotNull SecretKey secretKey) {
Check.stateCondition(encrypted, "Encryption is already enabled!");
this.decryptCipher = MojangCrypt.getCipher(2, secretKey);
this.encryptCipher = MojangCrypt.getCipher(1, secretKey);
this.encrypted = true;
Check.stateCondition(encryptionContext != null, "Encryption is already enabled!");
this.encryptionContext = new EncryptionContext(MojangCrypt.getCipher(1, secretKey), MojangCrypt.getCipher(2, secretKey));
}
/**
@ -391,10 +390,13 @@ public class PlayerSocketConnection extends PlayerConnection {
}
private void writeBufferSync0(@NotNull ByteBuffer buffer, int index, int length) {
if (encrypted) { // Encryption support
// Encrypt data
{
final EncryptionContext encryptionContext = this.encryptionContext;
if (encryptionContext != null) { // Encryption support
ByteBuffer output = PooledBuffers.tempBuffer();
try {
this.encryptCipher.update(buffer.slice(index, length), output);
encryptionContext.encrypt().update(buffer.slice(index, length), output);
buffer = output.flip();
index = 0;
} catch (ShortBufferException e) {
@ -402,7 +404,8 @@ public class PlayerSocketConnection extends PlayerConnection {
return;
}
}
}
// Write data
BinaryBuffer localBuffer = tickBuffer.getPlain();
final int capacity = localBuffer.capacity();
if (length <= capacity) {
@ -457,4 +460,7 @@ public class PlayerSocketConnection extends PlayerConnection {
this.tickBuffer.setPlain(newBuffer);
return newBuffer;
}
record EncryptionContext(Cipher encrypt, Cipher decrypt) {
}
}