Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-03-12 14:49:24 +01:00
Code Issues Projects Releases Wiki Activity

Evaluates banned commands with spaces

Browse Source 
Addresses #2092
This commit is contained in:
tastybento 2023-02-20 09:59:26 -08:00
parent 999ca242d7
commit 1b81e74f4c
2 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/world/bentobox/bentobox/listeners/BannedCommands.java
View File

@ -36,19 +36,42 @@ public class BannedCommands implements Listener {
public void onVisitorCommand(PlayerCommandPreprocessEvent e) {
if (!plugin.getIWM().inWorld(e.getPlayer().getLocation()) || e.getPlayer().isOp()
|| e.getPlayer().hasPermission(plugin.getIWM().getPermissionPrefix(e.getPlayer().getWorld()) + "mod.bypassprotect")
|| plugin.getIslands().locationIsOnIsland(e.getPlayer(), e.getPlayer().getLocation())) {
|| plugin.getIslands().locationIsOnIsland(e.getPlayer(), e.getPlayer().getLocation())
|| e.getMessage().isEmpty()
) {
return;
}
World w = e.getPlayer().getWorld();
// Check banned commands
// Split up the entry
String[] args = e.getMessage().substring(1).toLowerCase(java.util.Locale.ENGLISH).split(" ");
if (plugin.getIWM().getVisitorBannedCommands(w).contains(args[0])) {
User user = User.getInstance(e.getPlayer());
user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation("protection.command-is-banned"));
e.setCancelled(true);
// Loop through each of the banned commands
for (String cmd : plugin.getIWM().getVisitorBannedCommands(w)) {
if (checkCmd(cmd, args)) {
User user = User.getInstance(e.getPlayer());
user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation("protection.command-is-banned"));
e.setCancelled(true);
return;
}
}
}
private boolean checkCmd(String cmd, String[] args) {
// Commands are guilty until proven innocent :-)
boolean banned = true;
// Get the elements of the banned command by splitting it
String[] bannedSplit = cmd.toLowerCase(java.util.Locale.ENGLISH).split(" ");
// If the banned command has the same number of elements or less than the entered command then it may be banned
if (bannedSplit.length <= args.length) {
for (int i = 0; i < bannedSplit.length; i++) {
if (!bannedSplit[i].equals(args[i])) {
banned = false;
}
}
}
return banned;
}
/**
* Prevents falling players from using commands, like /warp
* @param e - event

29
src/test/java/world/bentobox/bentobox/listeners/BannedCommandsTest.java
View File

@ -244,6 +244,35 @@ public class BannedCommandsTest {
assertTrue(e.isCancelled());
}
/**
* Test for {@link BannedCommands#onCommand(PlayerCommandPreprocessEvent)}
*/
@Test
public void testBannedCommandsWithBannedCommandWithExtraBannedStuff() {
PlayerCommandPreprocessEvent e = new PlayerCommandPreprocessEvent(player, "/banned_command with extra stuff");
BannedCommands bvc = new BannedCommands(plugin);
List<String> banned = new ArrayList<>();
banned.add("banned_command with extra stuff");
banned.add("another_banned_command");
when(iwm.getVisitorBannedCommands(any())).thenReturn(banned);
bvc.onVisitorCommand(e);
verify(iwm).getVisitorBannedCommands(any());
assertTrue(e.isCancelled());
}
/**
* Test for {@link BannedCommands#onCommand(PlayerCommandPreprocessEvent)}
*/
@Test
public void testBannedCommandsWithNothing() {
PlayerCommandPreprocessEvent e = new PlayerCommandPreprocessEvent(player, "");
BannedCommands bvc = new BannedCommands(plugin);
bvc.onVisitorCommand(e);
assertFalse(e.isCancelled());
}
/**
* Test for {@link BannedCommands#onCommand(PlayerCommandPreprocessEvent)}