mirror of
https://github.com/LuckPerms/LuckPerms.git
synced 2024-09-10 04:48:07 +02:00
Only allow import and export commands to interact with files in the data directory (#1193)
This commit is contained in:
parent
2da027f3b5
commit
76517374a2
@ -56,7 +56,14 @@ public class ExportCommand extends SingleCommand {
|
||||
return CommandResult.STATE_ERROR;
|
||||
}
|
||||
|
||||
Path path = plugin.getBootstrap().getDataDirectory().resolve(args.get(0));
|
||||
Path dataDirectory = plugin.getBootstrap().getDataDirectory();
|
||||
Path path = dataDirectory.resolve(args.get(0));
|
||||
|
||||
if (!path.getParent().equals(dataDirectory) || path.getFileName().toString().equals("config.yml")) {
|
||||
Message.FILE_NOT_WITHIN_DIRECTORY.send(sender, path.toString());
|
||||
return CommandResult.INVALID_ARGS;
|
||||
}
|
||||
|
||||
boolean includeUsers = !args.remove("--without-users");
|
||||
|
||||
if (Files.exists(path)) {
|
||||
|
@ -57,7 +57,14 @@ public class ImportCommand extends SingleCommand {
|
||||
return CommandResult.STATE_ERROR;
|
||||
}
|
||||
|
||||
Path path = plugin.getBootstrap().getDataDirectory().resolve(args.get(0));
|
||||
Path dataDirectory = plugin.getBootstrap().getDataDirectory();
|
||||
Path path = dataDirectory.resolve(args.get(0));
|
||||
|
||||
if (!path.getParent().equals(dataDirectory) || path.getFileName().toString().equals("config.yml")) {
|
||||
Message.FILE_NOT_WITHIN_DIRECTORY.send(sender, path.toString());
|
||||
return CommandResult.INVALID_ARGS;
|
||||
}
|
||||
|
||||
if (!Files.exists(path)) {
|
||||
Message.IMPORT_LOG_DOESNT_EXIST.send(sender, path.toString());
|
||||
return CommandResult.INVALID_ARGS;
|
||||
|
@ -449,6 +449,7 @@ public enum Message {
|
||||
|
||||
IMPORT_ALREADY_RUNNING("&cAnother import process is already running. Please wait for it to finish and try again.", true),
|
||||
EXPORT_ALREADY_RUNNING("&cAnother export process is already running. Please wait for it to finish and try again.", true),
|
||||
FILE_NOT_WITHIN_DIRECTORY("&cError: File &4{}&c must be a direct child of the data directory.", true),
|
||||
IMPORT_LOG_DOESNT_EXIST("&cError: File &4{}&c does not exist.", true),
|
||||
IMPORT_LOG_NOT_READABLE("&cError: File &4{}&c is not readable.", true),
|
||||
IMPORT_LOG_FAILURE("&cAn unexpected error occured whilst reading from the log file.", true),
|
||||
|
Loading…
Reference in New Issue
Block a user