Cross server violation sync

Author: HaHaWTH

common/src/main/java/io/wdsj/asw/common/sync/VelocitySyncProtocol.java

@@ -0,0 +1,56 @@
+package io.wdsj.asw.common.sync;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.HexFormat;
+
+public final class VelocitySyncProtocol {
+    public static final int VERSION = 1;
+    public static final String PATH = "/asw";
+
+    public static final String TYPE_HELLO = "hello";
+    public static final String TYPE_HELLO_OK = "hello-ok";
+    public static final String TYPE_VL_INCREMENT = "vl-increment";
+    public static final String TYPE_VL_SYNC = "vl-sync";
+    public static final String TYPE_VL_QUERY = "vl-query";
+    public static final String TYPE_VL_RESET_REQUEST = "vl-reset-request";
+    public static final String TYPE_VL_RESET = "vl-reset";
+    public static final String TYPE_VL_RESET_ALL = "vl-reset-all";
+    public static final String TYPE_PING = "ping";
+    public static final String TYPE_PONG = "pong";
+
+    private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+
+    private VelocitySyncProtocol() {
+    }
+
+    public static String nonce() {
+        byte[] bytes = new byte[16];
+        SECURE_RANDOM.nextBytes(bytes);
+        return HexFormat.of().formatHex(bytes);
+    }
+
+    public static String signature(String secret, String serverId, String nonce, long timestamp) {
+        try {
+            Mac mac = Mac.getInstance("HmacSHA256");
+            mac.init(new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+            byte[] digest = mac.doFinal((serverId + nonce + timestamp).getBytes(StandardCharsets.UTF_8));
+            return HexFormat.of().formatHex(digest);
+        } catch (Exception exception) {
+            throw new IllegalStateException("Unable to calculate Velocity sync signature", exception);
+        }
+    }
+
+    public static boolean signatureMatches(String expected, String actual) {
+        if (expected == null || actual == null) {
+            return false;
+        }
+        return MessageDigest.isEqual(
+                expected.getBytes(StandardCharsets.UTF_8),
+                actual.getBytes(StandardCharsets.UTF_8)
+        );
+    }
+}

gradle.properties

@@ -11,3 +11,4 @@ cloudVersion=2.0.0-beta.15
 langchain4jVersion=1.16.3
 jmhVersion=1.37
 guavaVersion=33.4.0-jre
+javaWebSocketVersion=1.5.7

paper/build.gradle.kts

@@ -52,6 +52,7 @@ dependencies {
     implementation("com.github.Anon8281:UniversalScheduler:0.1.7")
     implementation("org.bstats:bstats-bukkit:3.2.1")
     implementation("de.exlll:configlib-yaml:4.8.1")
+    implementation("org.java-websocket:Java-WebSocket:${property("javaWebSocketVersion")}")
     runtimeOnly("org.snakeyaml:snakeyaml-engine:2.7")
 
     testImplementation("org.junit.jupiter:junit-jupiter:6.1.1")
@@ -138,6 +139,7 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("org.snakeyaml.engine.external", "io.wdsj.asw.bukkit.libs.snakeyaml.engine.external")
     relocate("org.incendo", "io.wdsj.asw.bukkit.libs.incendo")
     relocate("io.leangen.geantyref", "io.wdsj.asw.bukkit.libs.geantyref")
+    relocate("org.java_websocket", "io.wdsj.asw.bukkit.libs.websocket")
 
     exclude("org/slf4j/**")
     exclude("net/kyori/**")
@@ -151,6 +153,7 @@ tasks.named<ShadowJar>("shadowJar") {
         exclude(dependency("org.incendo:.*:.*"))
         exclude(dependency("de.exlll:.*:.*"))
         exclude(dependency("org.snakeyaml:snakeyaml-engine:.*"))
+        exclude(dependency("org.java-websocket:Java-WebSocket:.*"))
     }
 }
 

paper/src/main/java/io/wdsj/asw/bukkit/AdvancedSensitiveWords.java

@@ -26,6 +26,7 @@
 import io.wdsj.asw.bukkit.permission.cache.CachingPermTool;
 import io.wdsj.asw.bukkit.proxy.velocity.VelocityChannel;
 import io.wdsj.asw.bukkit.proxy.velocity.VelocityReceiver;
+import io.wdsj.asw.bukkit.proxy.velocity.sync.VelocitySyncClient;
 import io.wdsj.asw.bukkit.service.ListenerService;
 import io.wdsj.asw.bukkit.setting.PaperConfigurationService;
 import io.wdsj.asw.bukkit.setting.PluginMessages;
@@ -69,6 +70,7 @@ public final class AdvancedSensitiveWords extends JavaPlugin {
     private PaperConfigurationService configurationService;
     private volatile Updater.UpdateResult updateResult = Updater.UpdateResult.noUpdate();
     private AswCommandRegistrar commandRegistrar;
+    private VelocitySyncClient velocitySyncClient;
     public static TaskScheduler getScheduler() {
         return scheduler;
     }
@@ -92,6 +94,10 @@ public LlmChatDetectionService getLlmChatDetectionService() {
         return listenerService.getLlmChatDetectionService();
     }
 
+    public VelocitySyncClient getVelocitySyncClient() {
+        return velocitySyncClient;
+    }
+
     public static <T> T setting(SettingKey<T> key) {
         return instance.configurationService.get(key);
     }
@@ -125,6 +131,7 @@ public void onEnable() {
         commandRegistrar.register();
         setupMetrics();
         registerVelocityChannel();
+        startVelocitySyncClient();
         registerPlaceholderExpansion();
         scheduleViolationResetTask();
         long endTime = System.currentTimeMillis();
@@ -173,6 +180,7 @@ public void doInitTasks() {
 
     @Override
     public void onDisable() {
+        stopVelocitySyncClient();
         listenerService.unregisterListeners();
         getServer().getMessenger().unregisterOutgoingPluginChannel(this);
         getServer().getMessenger().unregisterIncomingPluginChannel(this);
@@ -201,6 +209,7 @@ public void reloadPluginConfiguration() {
         if (listenerService != null) {
             listenerService.reloadConfiguration();
         }
+        restartVelocitySyncClient();
     }
 
     private void setupMetrics() {
@@ -220,6 +229,26 @@ private void registerVelocityChannel() {
         getServer().getMessenger().registerIncomingPluginChannel(this, VelocityChannel.CHANNEL, new VelocityReceiver());
     }
 
+    private void startVelocitySyncClient() {
+        stopVelocitySyncClient();
+        if (!configurationService.get(PluginSettings.VELOCITY_SYNC_ENABLED)) {
+            return;
+        }
+        velocitySyncClient = new VelocitySyncClient(this);
+        velocitySyncClient.start();
+    }
+
+    private void stopVelocitySyncClient() {
+        if (velocitySyncClient != null) {
+            velocitySyncClient.close();
+            velocitySyncClient = null;
+        }
+    }
+
+    private void restartVelocitySyncClient() {
+        startVelocitySyncClient();
+    }
+
     private void registerPlaceholderExpansion() {
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI") &&
                 configurationService.get(PluginSettings.ENABLE_PLACEHOLDER)) {
@@ -230,7 +259,7 @@ private void registerPlaceholderExpansion() {
 
     private void scheduleViolationResetTask() {
         long resetIntervalTicks = configurationService.get(PluginSettings.VIOLATION_RESET_TIME) * 20L * 60L;
-        violationResetTask = new ViolationResetTask().runTaskTimerAsynchronously(this, resetIntervalTicks, resetIntervalTicks);
+        violationResetTask = new ViolationResetTask(configurationService).runTaskTimerAsynchronously(this, resetIntervalTicks, resetIntervalTicks);
     }
 
     private void checkForUpdatesAsync() {

paper/src/main/java/io/wdsj/asw/bukkit/command/AswCommandService.java

@@ -163,10 +163,14 @@ public void showPlayerInfo(CommandSender sender, Player player) {
     }
 
     public void resetPlayerViolations(CommandSender sender, Player player, ModuleType moduleType) {
-        if (moduleType == null) {
-            ViolationCounter.INSTANCE.resetViolationCount(player);
-        } else {
-            ViolationCounter.INSTANCE.resetViolationCount(player, moduleType);
+        boolean handledByProxy = plugin.getVelocitySyncClient() != null
+                && plugin.getVelocitySyncClient().requestReset(player, moduleType);
+        if (!handledByProxy) {
+            if (moduleType == null) {
+                ViolationCounter.INSTANCE.resetViolationCount(player);
+            } else {
+                ViolationCounter.INSTANCE.resetViolationCount(player, moduleType);
+            }
         }
         String message = MessageUtils.retrieveMessage(PluginMessages.MESSAGE_ON_COMMAND_RESET)
                 .replace("%player%", player.getName())

paper/src/main/java/io/wdsj/asw/bukkit/manage/punish/PunishmentService.java

@@ -124,7 +124,7 @@ private static void executeConsoleCommand(Player player, String[] parts) {
 
     private void executeProxyCommand(Player player, String[] parts) {
         requireArgument(parts, 1);
-        if (configuration.get(PluginSettings.HOOK_VELOCITY)) {
+        if (configuration.get(PluginSettings.ENABLE_ACTION_FORWARDING)) {
             VelocitySender.executeVelocityCommand(player, replacePlayerPlaceholder(parts[1], player));
         }
     }

paper/src/main/java/io/wdsj/asw/bukkit/manage/punish/ViolationCounter.java

@@ -4,6 +4,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.Map;
+import java.util.EnumMap;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -70,6 +71,32 @@ public void resetAllViolations() {
         violationCountMap.clear();
     }
 
+    public void setViolationCount(UUID playerId, ModuleType moduleType, long count) {
+        requireTrackedModule(moduleType);
+        if (count <= 0L) {
+            resetViolationCount(playerId, moduleType);
+            return;
+        }
+        violationCountMap.computeIfAbsent(playerId, ignored -> new ConcurrentHashMap<>())
+                .put(moduleType, count);
+    }
+
+    public void setViolationSnapshot(UUID playerId, Map<ModuleType, Long> counts) {
+        Map<ModuleType, Long> sanitized = new EnumMap<>(ModuleType.class);
+        for (Map.Entry<ModuleType, Long> entry : counts.entrySet()) {
+            ModuleType moduleType = entry.getKey();
+            long count = entry.getValue() == null ? 0L : entry.getValue();
+            if (moduleType != null && moduleType.isViolationTracked() && count > 0L) {
+                sanitized.put(moduleType, count);
+            }
+        }
+        if (sanitized.isEmpty()) {
+            violationCountMap.remove(playerId);
+            return;
+        }
+        violationCountMap.put(playerId, new ConcurrentHashMap<>(sanitized));
+    }
+
     private static void requireTrackedModule(ModuleType moduleType) {
         if (!moduleType.isViolationTracked()) {
             throw new IllegalArgumentException(moduleType + " does not have a violation counter");

paper/src/main/java/io/wdsj/asw/bukkit/proxy/velocity/VelocityReceiver.java

@@ -20,7 +20,7 @@ public class VelocityReceiver implements PluginMessageListener {
 
     @Override
     public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte @NotNull [] message) {
-        if (!setting(PluginSettings.HOOK_VELOCITY)) return;
+        if (!setting(PluginSettings.ENABLE_ACTION_FORWARDING)) return;
         if (channel.equals(VelocityChannel.CHANNEL)) {
             ByteArrayDataInput input = ByteStreams.newDataInput(message);
             if (!input.readUTF().equals(AdvancedSensitiveWords.PLUGIN_VERSION) && !warned) {