Add config option to allow symbolic links for files.

This commit is contained in:
Wizjany 2012-12-25 18:08:03 -05:00
parent a7b4913f6c
commit a54c7437fc
4 changed files with 9 additions and 2 deletions

View File

@ -107,6 +107,7 @@ public abstract class LocalConfiguration {
public int butcherDefaultRadius = -1; public int butcherDefaultRadius = -1;
public int butcherMaxRadius = -1; public int butcherMaxRadius = -1;
public boolean allowExtraDataValues = false; public boolean allowExtraDataValues = false;
public boolean allowSymlinks = false;
/** /**
* Loads the configuration. * Loads the configuration.

View File

@ -825,7 +825,7 @@ public class WorldEdit {
String filePath = f.getCanonicalPath(); String filePath = f.getCanonicalPath();
String dirPath = dir.getCanonicalPath(); String dirPath = dir.getCanonicalPath();
if (!filePath.substring(0, dirPath.length()).equals(dirPath)) { if (!filePath.substring(0, dirPath.length()).equals(dirPath) && !config.allowSymlinks) {
throw new FilenameResolutionException(filename, throw new FilenameResolutionException(filename,
"Path is outside allowable root"); "Path is outside allowable root");
} }

View File

@ -93,6 +93,8 @@ public class YAMLConfiguration extends LocalConfiguration {
saveDir = config.getString("saving.dir", saveDir); saveDir = config.getString("saving.dir", saveDir);
allowSymlinks = config.getBoolean("files.allow-symbolic-links", false);
disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null)); disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
allowedDataCycleBlocks = new HashSet<Integer>(config.getIntList("limits.allowed-data-cycle-blocks", null)); allowedDataCycleBlocks = new HashSet<Integer>(config.getIntList("limits.allowed-data-cycle-blocks", null));

View File

@ -16,6 +16,7 @@
# #
limits: limits:
allow-extra-data-values: false
max-blocks-changed: max-blocks-changed:
default: -1 default: -1
maximum: -1 maximum: -1
@ -56,10 +57,13 @@ scripting:
saving: saving:
dir: schematics dir: schematics
files:
allow-symbolic-links: false
history: history:
size: 15 size: 15
expiration: 10 expiration: 10
wand-item: 271 wand-item: 271
shell-save-type: shell-save-type:
no-double-slash: false no-double-slash: false