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

Harden the command-pre-process handling against fall-back aliases.

Browse Source 
These seem not to have been affected beforehand, due to the nature of
the SimpleCommandMap, however we don't want to exclusively rely on
fetching that one successfully.
This commit is contained in:
asofold 2014-04-15 20:31:37 +02:00
parent e017ebf54a
commit 547dfc890b
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/chat/ChatListener.java
View File

@ -1,8 +1,9 @@
package fr.neatmonster.nocheatplus.checks.chat; package fr.neatmonster.nocheatplus.checks.chat;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -159,19 +160,27 @@ public class ChatListener extends CheckListener implements INotifyReload, JoinLe
// Trim is necessary because the server accepts leading spaces with commands. // Trim is necessary because the server accepts leading spaces with commands.
final String message = event.getMessage(); final String message = event.getMessage();
final String lcMessage = message.trim().toLowerCase(); final String lcMessage = message.trim().toLowerCase();
// TODO: Remove bukkit: etc.
final String[] split = lcMessage.split(" ", 2); final String[] split = lcMessage.split(" ", 2);
final String alias = split[0].substring(1); final String alias = split[0].substring(1);
final Command command = CommandUtil.getCommand(alias); final Command command = CommandUtil.getCommand(alias);
final String lcAltMessage;
if (command != null){
lcAltMessage = "/" + command.getLabel().toLowerCase() + (split.length > 1 ? (" " + split[1]) : "");
}
else{
lcAltMessage = lcMessage;
}
// Prevent /op and /deop commands from being used by players. final List<String> messageVars = new ArrayList<String>(); // Could as well use an array and allow null on input of SimpleCharPrefixTree.
if (cc.consoleOnlyCheck && consoleOnlyCommands.hasAnyPrefixWords(lcMessage, lcAltMessage)) { messageVars.add(lcMessage);
String checkMessage = message; // Message to run chat checks on.
if (command != null){
messageVars.add("/" + command.getLabel().toLowerCase() + (split.length > 1 ? (" " + split[1]) : ""));
}
if (alias.indexOf(":") != -1) {
final int index = message.indexOf(":") + 1;
if (index < message.length()) {
checkMessage = message.substring(index);
messageVars.add(checkMessage.toLowerCase());
}
}
// Prevent commands from being used by players (e.g. /op /deop /reload).
if (cc.consoleOnlyCheck && consoleOnlyCommands.hasAnyPrefixWords(messageVars)) {
if (command == null || command.testPermission(player)){ if (command == null || command.testPermission(player)){
player.sendMessage(cc.consoleOnlyMessage); player.sendMessage(cc.consoleOnlyMessage);
} }
@ -180,18 +189,17 @@ public class ChatListener extends CheckListener implements INotifyReload, JoinLe
} }
// Handle as chat or command. // Handle as chat or command.
final boolean handleAsChat = chatCommands.hasAnyPrefixWords(lcMessage, lcAltMessage); if (chatCommands.hasAnyPrefixWords(messageVars)){
if (handleAsChat){
// Treat as chat. // Treat as chat.
// TODO: Consider requesting permission updates on these, for consistency. // TODO: Consider requesting permission updates on these, for consistency.
// TODO: Cut off the command (?). // TODO: Cut off the command ?.
if (textChecks(player, message, true, false)) { if (textChecks(player, checkMessage, true, false)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
else if (!commandExclusions.hasAnyPrefixWords(lcMessage, lcAltMessage)){ else if (!commandExclusions.hasAnyPrefixWords(messageVars)){
// Treat as command. // Treat as command.
if (commands.isEnabled(player) && commands.check(player, message, captcha)) { if (commands.isEnabled(player) && commands.check(player, checkMessage, captcha)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }