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

Assume a file not being in a subdirectory of root means a symlink is used (#1838)

Browse Source
This commit is contained in:
Jordan 2022-06-23 17:32:21 +01:00 committed by GitHub
parent 010611c4ac
commit 800988aae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
View File

@ -71,6 +71,7 @@ import com.sk89q.worldedit.util.formatting.component.SubtleFormat;
import com.sk89q.worldedit.util.formatting.text.Component; import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.format.TextColor; import com.sk89q.worldedit.util.formatting.text.format.TextColor;
import com.sk89q.worldedit.util.io.file.FilenameResolutionException;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import org.enginehub.piston.annotation.Command; import org.enginehub.piston.annotation.Command;
@ -78,7 +79,6 @@ import org.enginehub.piston.annotation.CommandContainer;
import org.enginehub.piston.annotation.param.Arg; import org.enginehub.piston.annotation.param.Arg;
import org.enginehub.piston.annotation.param.ArgFlag; import org.enginehub.piston.annotation.param.ArgFlag;
import org.enginehub.piston.annotation.param.Switch; import org.enginehub.piston.annotation.param.Switch;
import org.enginehub.piston.exception.StopExecutionException;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.awt.RenderingHints; import java.awt.RenderingHints;
@ -876,8 +876,9 @@ public class UtilityCommands {
} }
} }
try { try {
if (!MainUtil.isInSubDirectory(root, file)) { // Assume a file not being in a subdirectory of root means a symlink is used
throw new StopExecutionException(TextComponent.of("Invalid path")); if (!MainUtil.isInSubDirectory(root, file) && !WorldEdit.getInstance().getConfiguration().allowSymlinks) {
throw new FilenameResolutionException(name, Caption.of("worldedit.error.file-resolution.outside-root"));
} }
} catch (IOException ignored) { } catch (IOException ignored) {
} }