test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(文件管理): 增加minio上传文件名的校验 

增加minio上传文件名的校验
This commit is contained in:
song-tianyang 2022-12-27 17:12:53 +08:00 committed by 建国
parent d3f7d0086b
commit 7e0ac25c86
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/FileUtils.java
View File

@ -60,7 +60,6 @@ public class FileUtils {
} }
public static void createFile(String filePath, byte[] fileBytes) { public static void createFile(String filePath, byte[] fileBytes) {
validateFileName(filePath);
File file = new File(filePath); File file = new File(filePath);
if (file.exists()) { if (file.exists()) {
file.delete(); file.delete();

5
framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/repository/MinIOFileRepository.java
View File

@ -1,5 +1,6 @@
package io.metersphere.metadata.repository; package io.metersphere.metadata.repository;
import io.metersphere.commons.utils.FileUtils;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import io.metersphere.config.MinioProperties; import io.metersphere.config.MinioProperties;
import io.metersphere.dto.FileInfoDTO; import io.metersphere.dto.FileInfoDTO;
@ -27,6 +28,7 @@ public class MinIOFileRepository implements FileRepository {
@Override @Override
public String saveFile(MultipartFile file, FileRequest request) throws Exception { public String saveFile(MultipartFile file, FileRequest request) throws Exception {
FileUtils.validateFileName(request.getFileName());
String bucket = minioProperties.getBucket(); String bucket = minioProperties.getBucket();
String fileName = request.getProjectId() + "/" + request.getFileName(); String fileName = request.getProjectId() + "/" + request.getFileName();
minioClient.putObject(PutObjectArgs.builder() minioClient.putObject(PutObjectArgs.builder()
@ -40,6 +42,7 @@ public class MinIOFileRepository implements FileRepository {
@Override @Override
public String saveFile(byte[] bytes, FileRequest request) throws Exception { public String saveFile(byte[] bytes, FileRequest request) throws Exception {
FileUtils.validateFileName(request.getFileName());
String bucket = minioProperties.getBucket(); String bucket = minioProperties.getBucket();
String fileName = request.getProjectId() + "/" + request.getFileName(); String fileName = request.getProjectId() + "/" + request.getFileName();
try ( try (
@ -49,7 +52,7 @@ public class MinIOFileRepository implements FileRepository {
.bucket(bucket) // 存储桶 .bucket(bucket) // 存储桶
.object(fileName) // 文件名 .object(fileName) // 文件名
.stream(inputStream, bytes.length, -1) // 文件内容 .stream(inputStream, bytes.length, -1) // 文件内容
// .contentType(file.getContentType()) // 文件类型 // .contentType(file.getContentType()) // 文件类型
.build()); .build());
} }
return String.format("%s/%s/%s", minioProperties.getEndpoint(), bucket, fileName); return String.format("%s/%s/%s", minioProperties.getEndpoint(), bucket, fileName);