From 076afec36224a1592e64a9ac1198737726b0e4c8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 3 Apr 2023 10:45:02 +0100
Subject: [PATCH] Do not send expired keys to players on login (#9090)

This patch will prevent sending expired keys to players when logging into a server, while the client does have some grace period to prevent issues, if a key has expired beyond the grace period, connecting clients will be disconnected from the server upon join. The client should update keys before this key even expires, and a new key will be broadcasted out if we somehow actually get one.
---
 ...expired-keys-from-impacting-new-join.patch | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch

diff --git a/patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch
new file mode 100644
index 0000000000..33b91aa1f4
--- /dev/null
+++ b/patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Mon, 3 Apr 2023 08:55:52 +0100
+Subject: [PATCH] Prevent causing expired keys from impacting new joins
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
+@@ -0,0 +0,0 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet<ClientGamePacke
+         INITIALIZE_CHAT((serialized, buf) -> {
+             serialized.chatSession = buf.readNullable(RemoteChatSession.Data::read);
+         }, (buf, entry) -> {
+-            buf.writeNullable(entry.chatSession, RemoteChatSession.Data::write);
++            // Paper start
++            RemoteChatSession.Data chatSession = entry.chatSession;
++            if (chatSession != null && chatSession.profilePublicKey().hasExpired()) {
++                chatSession = null;
++            }
++            buf.writeNullable(chatSession, RemoteChatSession.Data::write);
++            // Paper end
+         }),
+         UPDATE_GAME_MODE((serialized, buf) -> {
+             serialized.gameMode = GameType.byId(buf.readVarInt());
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     private final AtomicReference<Instant> lastChatTimeStamp;
+     @Nullable
+     private RemoteChatSession chatSession;
++    private boolean hasLoggedExpiry = false; // Paper
+     private SignedMessageChain.Decoder signedMessageDecoder;
+     private final LastSeenMessagesValidator lastSeenMessages;
+     private final MessageSignatureCache messageSignatureCache;
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+             this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
+         }
+ 
++        // Paper start
++        if (!hasLoggedExpiry && this.chatSession != null && this.chatSession.profilePublicKey().data().hasExpired()) {
++            LOGGER.info("Player profile key for {} has expired!", this.player.getName().getString());
++            hasLoggedExpiry = true;
++        }
++        // Paper end
++
+     }
+ 
+     public void resetPosition() {
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ 
+     private void resetPlayerChatState(RemoteChatSession session) {
+         this.chatSession = session;
++        this.hasLoggedExpiry = false; // Paper
+         this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
+         this.chatMessageChain.append((executor) -> {
+             this.player.setChatSession(session);