Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Set default child permissions in plugin.yml.

Browse Source
This commit is contained in:
asofold 2018-02-07 16:42:53 +01:00
parent 6f4c61d8f3
commit 5d5e45e2df
5 changed files with 589 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -134,8 +134,8 @@ public abstract class ConfPaths {
public static final String DATA_CONSISTENCYCHECKS_SUPPRESSWARNINGS = DATA_CONSISTENCYCHECKS + "suppresswarnings";
// Permission caching setup.
private static final String PERMISSIONS = "permissions.";
private static final String PERMISSIONS_POLICY = PERMISSIONS + "policy.";
private static final String PERMISSIONS = "permissions.";
private static final String PERMISSIONS_POLICY = PERMISSIONS + "policy.";
public static final String PERMISSIONS_POLICY_DEFAULT = PERMISSIONS_POLICY + "default";
public static final String PERMISSIONS_POLICY_RULES = PERMISSIONS_POLICY + "rules";

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/permissions/PermissionUtil.java
View File

@ -33,7 +33,7 @@ import fr.neatmonster.nocheatplus.utilities.ColorUtil;
public class PermissionUtil {
static final String AUTO_GENERATED = "Auto-generated permission (NoCheatPlus).";
public static final String AUTO_GENERATED = "Auto-generated permission (NoCheatPlus).";
/**
* Entry for what the old state of a command was.

51
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java
View File

@ -46,12 +46,10 @@ import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitScheduler;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.blockbreak.BlockBreakListener;
import fr.neatmonster.nocheatplus.checks.blockinteract.BlockInteractListener;
import fr.neatmonster.nocheatplus.checks.blockplace.BlockPlaceListener;
@ -818,17 +816,27 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
* Lazy initialization of basics (static API, configuration, logging).
*/
private void setupBasics() {
// Ensure permissions are registered early.
for (RegisteredPermission rp : Permissions.getPermissions()) {
if (permissionRegistry.getPermissionInfo(rp.getId()) == null) {
permissionRegistry.addRegisteredPermission(rp);
}
}
// API.
if (NCPAPIProvider.getNoCheatPlusAPI() == null) {
NCPAPIProvider.setNoCheatPlusAPI(this);
}
// Initialize server version.
if (ServerVersion.getMinecraftVersion() == GenericVersion.UNKNOWN_VERSION) {
BukkitVersion.init();
}
// Configuration.
if (!ConfigManager.isInitialized()) {
ConfigManager.init(this);
// Basic setup for exemption (uses CheckType). This is redundant, but should not hurt.
NCPExemptionManager.setExemptionSettings(new ExemptionSettings(ConfigManager.getConfigFile()));
}
// Logging.
if (logManager == null || logManager.getStreamID(Streams.STATUS.name) != Streams.STATUS) {
logManager = new BukkitLogManager(this);
StaticLog.setStreamID(Streams.INIT);
@ -844,11 +852,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
}, "[GenericInstanceRegistry] ");
}
for (RegisteredPermission rp : Permissions.getPermissions()) {
if (permissionRegistry.getPermissionInfo(rp.getId()) == null) {
permissionRegistry.addRegisteredPermission(rp);
}
}
}
/* (non-Javadoc)
@ -964,9 +967,6 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
command.setExecutor(commandHandler);
// (CommandHandler is TabExecutor.)
// Add default .silent and command/filter child permissions.
addDefaultChildPermissions(commandHandler);
////////////////////////////////
// Tasks, post-rumble-logging
////////////////////////////////
@ -1044,42 +1044,15 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI {
}
}
private void addDefaultChildPermissions(final NoCheatPlusCommand commandHandler) {
logManager.debug(Streams.INIT, "Set default child permissions...");
try {
// Set child permissions for commands for faster checking.
PermissionUtil.addChildPermission(commandHandler.getAllSubCommandPermissions(),
Permissions.FILTER_COMMAND_NOCHEATPLUS,
PermissionDefault.OP);
} catch (Throwable t) {
logManager.severe(Streams.INIT, "Failed to complement permissions: " + t.getClass().getSimpleName());
logManager.severe(Streams.INIT, t);
}
// Set .silent child permissions for all check permissions.
for (CheckType checkType : CheckType.values()) {
final RegisteredPermission permission = checkType.getPermission();
if (permission == null) {
continue;
}
try {
// PermissionDefault.FALSE: Ensure it's not there by accident / non-typical.;
PermissionUtil.addChildPermissionBySuffix(permission, "silent", permissionRegistry, PermissionDefault.FALSE, false);
} catch (Throwable t) {
logManager.severe(Streams.INIT, "Failed to add .silent child permission for " + permission + ": " + t.getClass().getSimpleName());
logManager.severe(Streams.INIT, t);
}
}
}
/**
* Actions to be done after enable of all plugins. This aims at reloading mainly.
*/
private void postEnable(final Player[] onlinePlayers) {
logManager.info(Streams.INIT, "Post-enable running...");
final ConfigFile config = ConfigManager.getConfigFile();
try {
// Command protection feature.
if (ConfigManager.getConfigFile().getBoolean(ConfPaths.PROTECT_PLUGINS_HIDE_ACTIVE)) {
if (config.getBoolean(ConfPaths.PROTECT_PLUGINS_HIDE_ACTIVE)) {
setupCommandProtection();
}
} catch (Throwable t) {

1007
NCPPlugin/src/main/resources/plugin.yml
View File

File diff suppressed because it is too large Load Diff

29
NCPPlugin/src/test/java/fr/neatmonster/nocheatplus/test/TestDump.java Normal file
View File

@ -0,0 +1,29 @@
package fr.neatmonster.nocheatplus.test;
import org.junit.Test;
import fr.neatmonster.nocheatplus.PluginTests;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.CheckType.CheckTypeType;
import fr.neatmonster.nocheatplus.permissions.RegisteredPermission;
/**
* Uh oh.
* @author asofold
*
*/
public class TestDump {
@Test
public void dumpCheckSilentPermissionForPluginYML() {
PluginTests.setUnitTestNoCheatPlusAPI(false);
for (CheckType checkType : CheckType.values()) {
final RegisteredPermission permission = checkType.getPermission();
// Only add for actual checks at present.
if (permission == null || checkType.getType() != CheckTypeType.CHECK) {
continue;
}
// Print:
System.out.print(" " + permission.getStringRepresentation() + ".silent:\n default: false\n");
}
}
}