From 91c01e34224e6c9f1c553d89df31eb5a23fa7593 Mon Sep 17 00:00:00 2001 From: games647 Date: Fri, 24 Jun 2022 17:09:54 +0200 Subject: [PATCH] Reuse verify token tick message for signature verification diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java index 6c578ff..92e1dcd 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java @@ -153,11 +153,11 @@ public class ProtocolLibListener extends PacketAdapter { Runnable verifyTask = new VerifyResponseTask(plugin, packetEvent, sender, sharedSecret, keyPair); plugin.getScheduler().runAsync(verifyTask); } else { - sender.kickPlayer("Invalid signature"); + sender.kickPlayer(plugin.getCore().getMessage("invalid-verify-token")); plugin.getLog().error("Invalid signature from player {}", sender); } } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException signatureEx) { - sender.kickPlayer("Invalid signature"); + sender.kickPlayer(plugin.getCore().getMessage("invalid-verify-token")); plugin.getLog().error("Invalid signature from player {}", sender, signatureEx); } } --- .../bukkit/listener/protocollib/ProtocolLibListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java index 5b4fb135..f973a901 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java @@ -153,11 +153,11 @@ public class ProtocolLibListener extends PacketAdapter { Runnable verifyTask = new VerifyResponseTask(plugin, packetEvent, sender, session, sharedSecret, keyPair); plugin.getScheduler().runAsync(verifyTask); } else { - sender.kickPlayer("Invalid signature"); + sender.kickPlayer(plugin.getCore().getMessage("invalid-verify-token")); plugin.getLog().error("Invalid signature from player {}", sender); } } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException signatureEx) { - sender.kickPlayer("Invalid signature"); + sender.kickPlayer(plugin.getCore().getMessage("invalid-verify-token")); plugin.getLog().error("Invalid signature from player {}", sender, signatureEx); } }