public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-12 16:31:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 任意文件删除

Browse Source
This commit is contained in:
tjlygdx
2026-06-10 11:00:15 +08:00
parent 59cb3c0b07
commit 45c984fc9e
2 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

@@ -138,7 +138,7 @@ public class ExportCenterManage implements BaseExportApi {
exportTask.setExportMachineName(hostName());
exportTask.setExportTime(System.currentTimeMillis());
exportTaskMapper.updateById(exportTask);
FileUtils.deleteDirectoryRecursively(resolveExportTaskDirectory(id));
FileUtils.deleteDirectoryRecursively(resolveExportBasePath(), resolveExportTaskDirectory(id));
if (exportTask.getExportFromType().equalsIgnoreCase("chart")) {
ChartExcelRequest request = JsonUtil.parseObject(exportTask.getParams(), ChartExcelRequest.class);
exportCenterDownLoadManage.startViewTask(exportTask, request);
@@ -377,15 +377,19 @@ public class ExportCenterManage implements BaseExportApi {
iterator.remove();
}
}
FileUtils.deleteDirectoryRecursively(resolveExportTaskDirectory(id));
FileUtils.deleteDirectoryRecursively(resolveExportBasePath(), resolveExportTaskDirectory(id));
exportTaskMapper.deleteById(id);
}
private Path resolveExportBasePath() {
return Paths.get(exportData_path).toAbsolutePath().normalize();
}
private Path resolveExportTaskDirectory(String taskId) {
if (StringUtils.isBlank(taskId) || !StringUtils.isNumeric(taskId)) {
DEException.throwException("任务不存在");
}
Path exportBasePath = Paths.get(exportData_path).toAbsolutePath().normalize();
Path exportBasePath = resolveExportBasePath();
Path exportTaskPath = exportBasePath.resolve(taskId).normalize();
if (!exportTaskPath.startsWith(exportBasePath)) {
DEException.throwException("Invalid export task path");

67
sdk/common/src/main/java/io/dataease/utils/FileUtils.java
View File

@@ -10,9 +10,10 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.FileVisitResult;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -295,32 +296,52 @@ public class FileUtils {
}
public static boolean deleteDirectoryRecursively(String directoryPath) {
Assert.hasText(directoryPath, "Directory path must not be blank");
return deleteDirectoryRecursively(Paths.get(directoryPath));
}
public static boolean deleteDirectoryRecursively(Path directory) {
public static boolean deleteDirectoryRecursively(Path baseDirectory, Path directory) {
Assert.notNull(baseDirectory, "Base directory must not be null");
Assert.notNull(directory, "Directory path must not be null");
Path normalizedBaseDirectory = baseDirectory.toAbsolutePath().normalize();
Path normalizedDirectory = directory.toAbsolutePath().normalize();
if (Files.notExists(normalizedDirectory, LinkOption.NOFOLLOW_LINKS)) {
if (!normalizedDirectory.startsWith(normalizedBaseDirectory)) {
DEException.throwException("Invalid directory path");
}
if (Files.notExists(normalizedDirectory)) {
return true;
}
File[] files = normalizedDirectory.toFile().listFiles();
if (files == null) {
return normalizedDirectory.toFile().delete();
return deleteDirectoryRecursivelyInternal(normalizedBaseDirectory, normalizedDirectory);
}
private static boolean deleteDirectoryRecursivelyInternal(Path baseDirectory, Path directory) {
try {
Files.walkFileTree(directory, new SimpleFileVisitor<>() {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
validateChildPath(baseDirectory, file);
Files.deleteIfExists(file);
return FileVisitResult.CONTINUE;
}
@Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
if (exc != null) {
throw exc;
}
validateChildPath(baseDirectory, dir);
Files.deleteIfExists(dir);
return FileVisitResult.CONTINUE;
}
});
return true;
} catch (IOException e) {
LogUtil.error(e.getMessage(), e);
DEException.throwException(e);
}
for (File file : files) {
Path child = file.toPath().toAbsolutePath().normalize();
if (!child.startsWith(normalizedDirectory)) {
DEException.throwException("Invalid directory path");
}
if (Files.isDirectory(child, LinkOption.NOFOLLOW_LINKS)) {
deleteDirectoryRecursively(child);
} else {
file.delete();
}
return false;
}
private static void validateChildPath(Path baseDirectory, Path childPath) {
Path normalizedChildPath = childPath.toAbsolutePath().normalize();
if (!normalizedChildPath.startsWith(baseDirectory)) {
DEException.throwException("Invalid directory path");
}
return normalizedDirectory.toFile().delete();
}
}