PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#2568: Check permissions for inject_commands

Browse Source
This commit is contained in:
md_5 2018-12-21 09:50:54 +11:00
parent 14fbe6178f
commit a47b803385
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/main/java/net/md_5/bungee/api/plugin/Command.java
View File

@ -51,4 +51,15 @@ public abstract class Command
* @param args arguments used to invoke this command * @param args arguments used to invoke this command
*/ */
public abstract void execute(CommandSender sender, String[] args); public abstract void execute(CommandSender sender, String[] args);
/**
* Check if this command can be executed by the given sender.
*
* @param sender the sender to check
* @return whether the sender can execute this
*/
public boolean hasPermission(CommandSender sender)
{
return permission == null || permission.isEmpty() || sender.hasPermission( permission );
}
} }

7
api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
View File

@ -144,8 +144,7 @@ public class PluginManager
return false; return false;
} }
String permission = command.getPermission(); if ( !command.hasPermission( sender ) )
if ( permission != null && !permission.isEmpty() && !sender.hasPermission( permission ) )
{ {
if ( tabResults == null ) if ( tabResults == null )
{ {
@ -435,8 +434,8 @@ public class PluginManager
* *
* @return commands * @return commands
*/ */
public Collection<String> getCommands() public Collection<Map.Entry<String, Command>> getCommands()
{ {
return Collections.unmodifiableCollection( commandMap.keySet() ); return Collections.unmodifiableCollection( commandMap.entrySet() );
} }
} }

8
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -12,6 +12,7 @@ import java.io.DataInput;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import java.util.Map;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.ServerConnection; import net.md_5.bungee.ServerConnection;
@ -26,6 +27,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.event.PluginMessageEvent;
import net.md_5.bungee.api.event.ServerConnectEvent; import net.md_5.bungee.api.event.ServerConnectEvent;
import net.md_5.bungee.api.event.ServerKickEvent; import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.score.Objective; import net.md_5.bungee.api.score.Objective;
import net.md_5.bungee.api.score.Position; import net.md_5.bungee.api.score.Position;
import net.md_5.bungee.api.score.Score; import net.md_5.bungee.api.score.Score;
@ -540,11 +542,11 @@ public class DownstreamBridge extends PacketHandler
if ( BungeeCord.getInstance().config.isInjectCommands() ) if ( BungeeCord.getInstance().config.isInjectCommands() )
{ {
for ( String command : bungee.getPluginManager().getCommands() ) for ( Map.Entry<String, Command> command : bungee.getPluginManager().getCommands() )
{ {
if ( commands.getRoot().getChild( command ) == null ) if ( commands.getRoot().getChild( command.getKey() ) == null && command.getValue().hasPermission( con ) )
{ {
LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command ) LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() ) .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
.suggests( Commands.SuggestionRegistry.ASK_SERVER ) ) .suggests( Commands.SuggestionRegistry.ASK_SERVER ) )
.build(); .build();