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

fix(文件管理): 修复文件管理上传不了平台交互jar包的问题 

修复文件管理上传不了平台交互jar包的问题
This commit is contained in:
song-tianyang 2022-12-28 18:05:15 +08:00 committed by 建国
parent 778676c8da
commit 91d395dc71
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,17 +33,6 @@ public class FileUtils {
public static final String ATTACHMENT_TMP_DIR = "/opt/metersphere/data/attachment/tmp"; public static final String ATTACHMENT_TMP_DIR = "/opt/metersphere/data/attachment/tmp";
public static void validateFileName(String fileName) { public static void validateFileName(String fileName) {
if (StringUtils.isNotEmpty(fileName) && StringUtils.contains(fileName, File.separator)) {
MSException.throwException(Translator.get("invalid_parameter"));
}
}
/**
* 上传Minio的文件名称检查只需要判断是否带有./ ../ 这样的非法文件名
*
* @param fileName
*/
public static void validateMinIOFileName(String fileName) {
if (StringUtils.isNotEmpty(fileName) && StringUtils.contains(fileName, "." + File.separator)) { if (StringUtils.isNotEmpty(fileName) && StringUtils.contains(fileName, "." + File.separator)) {
MSException.throwException(Translator.get("invalid_parameter")); MSException.throwException(Translator.get("invalid_parameter"));
} }

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

@ -28,7 +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.validateMinIOFileName(request.getFileName()); 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()