coral/Sentinel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improving word lists to make them all regex

Browse Source
This commit is contained in:
EverCoral
2025-03-19 20:15:11 -05:00
parent b85b53f6df
commit 8299d75adf
3 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/trouper/sentinel/data/config/AdvancedConfig.java
View File

@@ -18,6 +18,15 @@ public class AdvancedConfig implements JsonSerializable<AdvancedConfig> {
file.getParentFile().mkdirs();
return file;
}
public boolean pluginCloakingWhitelist = false;
public List<String> intendedCommands = Arrays.asList(
"tpa",
"msg",
"rtp"
);
public List<String> fakePlugins = Arrays.asList(
"Nocheatplus",
"Negativity",

60
src/main/java/me/trouper/sentinel/server/events/violations/players/PluginCloakingPacket.java
View File

@@ -3,6 +3,8 @@ package me.trouper.sentinel.server.events.violations.players;
import com.github.retrooper.packetevents.event.*;
import com.github.retrooper.packetevents.protocol.chat.Node;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientChatCommand;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientChatCommandUnsigned;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientTabComplete;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerDeclareCommands;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerTabComplete;
@@ -15,32 +17,64 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue;
public class PluginCloakingPacket implements PacketListener {
public static final List<UUID> tabReplaceQueue = new ArrayList<>();
public static final ConcurrentLinkedQueue<UUID> tabReplaceQueue = new ConcurrentLinkedQueue<>();
@Override
public void onPacketReceive(PacketReceiveEvent event) {
if (!Sentinel.getInstance().getDirector().io.mainConfig.plugin.pluginHider) return;
if (event.getPacketType() != PacketType.Play.Client.TAB_COMPLETE) return;
switch (event.getPacketType()) {
case PacketType.Play.Client.TAB_COMPLETE -> {
WrapperPlayClientTabComplete wrapper = new WrapperPlayClientTabComplete(event);
Player player = (Player) event.getPlayer();
if (player == null) return;
if (PlayerUtils.isTrusted(player)) return;
WrapperPlayClientTabComplete wrapper = new WrapperPlayClientTabComplete(event);
Player player = (Player) event.getPlayer();
if (player == null) return;
if (PlayerUtils.isTrusted(player)) return;
String text = wrapper.getText();
if (text.startsWith("/")) text = text.substring(1);
text = text.split(" ")[0];
String text = wrapper.getText();
for (String versionAlias : Sentinel.getInstance().getDirector().io.advConfig.pluginTabCompletions) {
if (!text.contains(versionAlias)) continue;
ServerUtils.verbose("Caught a version command tab completion. (%s -> %s)".formatted(text,versionAlias));
tabReplaceQueue.add(player.getUniqueId());
break;
List<String> intendedCommands = Sentinel.getInstance().getDirector().io.advConfig.intendedCommands;
List<String> pluginTabCompletions = Sentinel.getInstance().getDirector().io.advConfig.pluginTabCompletions;
if (Sentinel.getInstance().getDirector().io.advConfig.pluginCloakingWhitelist) {
boolean whitelisted = false;
for (String pattern : intendedCommands) {
if (text.matches(pattern)) {
whitelisted = true;
break;
}
}
if (!whitelisted) {
ServerUtils.verbose("Caught a non-whitelisted tab completion. (%s)".formatted(text));
tabReplaceQueue.add(player.getUniqueId());
}
}
for (String pattern : pluginTabCompletions) {
if (text.matches(pattern)) {
ServerUtils.verbose("Caught a plugin listing command tab completion. (%s -> %s)".formatted(text, pattern));
tabReplaceQueue.add(player.getUniqueId());
break;
}
}
}
case PacketType.Play.Client.CHAT_COMMAND, PacketType.Play.Client.CHAT_COMMAND_UNSIGNED -> {
WrapperPlayClientChatCommandUnsigned wrapper = new WrapperPlayClientChatCommandUnsigned(event);
WrapperPlayClientChatCommand wrappers = new WrapperPlayClientChatCommand(event);
wrapper.getCommand();
wrappers.getCommand();
}
default -> {}
}
}
@Override
public void onPacketSend(PacketSendEvent event) {
if (!Sentinel.getInstance().getDirector().io.mainConfig.plugin.pluginHider) return;

1
src/main/resources/plugin.yml
View File

@@ -12,6 +12,7 @@ softdepend:
- ViaBackwards
- ViaRewind
- Geyser-Spigot
- NoChatReports
load: POSTWORLD
permissions:
sentinel.admin: