Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix symlink detection.

Browse Source
This commit is contained in:
wizjany 2019-03-15 09:10:51 -04:00
parent 4191f017f1
commit 18414fe3b5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -284,12 +284,18 @@ public final class WorldEdit {
Path filePath = Paths.get(f.toURI()).normalize(); Path filePath = Paths.get(f.toURI()).normalize();
Path dirPath = Paths.get(dir.toURI()).normalize(); Path dirPath = Paths.get(dir.toURI()).normalize();
if (!filePath.startsWith(dirPath) boolean inDir = filePath.startsWith(dirPath);
|| (!getConfiguration().allowSymlinks && !filePath.toRealPath().startsWith(dirPath))) { Path existingParent = filePath;
do {
existingParent = existingParent.getParent();
} while (existingParent != null && !existingParent.toFile().exists());
boolean isSym = existingParent != null && !existingParent.toRealPath().equals(existingParent);
if (!inDir || (!getConfiguration().allowSymlinks && isSym)) {
throw new FilenameResolutionException(filename, "Path is outside allowable root"); throw new FilenameResolutionException(filename, "Path is outside allowable root");
} }
return f; return filePath.toFile();
} catch (IOException e) { } catch (IOException e) {
throw new FilenameResolutionException(filename, "Failed to resolve path"); throw new FilenameResolutionException(filename, "Failed to resolve path");
} }