Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions base/src/main/java/com/tinyengine/it/common/enums/Enums.java
Original file line number Diff line number Diff line change
Expand Up @@ -908,4 +908,94 @@ public String getValue() {
return value;
}
}

public enum FileType {
/**
* File type zip.
*/
ZIP("application/zip"),

/**
* File type json.
*/
JSON("application/json"),

/**
* File type text.
*/
TXT("text/plain"),

/**
* File type html.
*/
HTML("text/html"),
/**
* File type png.
*/
PNG("image/png"),

/**
* File type jpg.
*/
JPG("image/jpeg");
private final String value;

FileType(String value) {
this.value = value;
}

/**
* Gets value.
*
* @return the value
*/
public String getValue() {
return value;
}
}

public enum FileNameEnd {
/**
* File name end .zip.
*/
ZIP(".zip"),

/**
* File name end .json.
*/
JSON(".json"),

/**
* File name end .text.
*/
TXT(".txt"),

/**
* File name end .html.
*/
HTML(".html"),
/**
* File name end .png.
*/
PNG(".png"),

/**
* File name end .jpg.
*/
JPG(".jpeg");
private final String value;

FileNameEnd(String value) {
this.value = value;
}

/**
* Gets value.
*
* @return the value
*/
public String getValue() {
return value;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
package com.tinyengine.it.common.utils;

import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.tinyengine.it.common.exception.ExceptionEnum;
import com.tinyengine.it.common.exception.ServiceException;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;

import java.io.File;
import java.io.IOException;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -177,5 +179,14 @@ private static String getFileName(String filePath) {
return file.getName();
}

public static void isValidJson(MultipartFile file) {
ObjectMapper objectMapper = new ObjectMapper();
try {
// 将 MultipartFile 转换为 InputStream 并解析 JSON
objectMapper.readTree(file.getInputStream());
} catch (IOException e) {
throw new ServiceException(ExceptionEnum.CM308.getResultCode(), ExceptionEnum.CM308.getResultMsg());
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
package com.tinyengine.it.controller;

import com.tinyengine.it.common.base.Result;
import com.tinyengine.it.common.enums.Enums;
import com.tinyengine.it.common.exception.ExceptionEnum;
import com.tinyengine.it.common.log.SystemControllerLog;
import com.tinyengine.it.common.utils.SecurityFileCheckUtil;
Expand Down Expand Up @@ -74,6 +75,8 @@ public Result<FileResult> bundleCreateComponent(@RequestParam MultipartFile file
return Result.failed(ExceptionEnum.CM307);
}
SecurityFileCheckUtil.validFileName(file.getOriginalFilename());
SecurityFileCheckUtil.checkFileType(file, Enums.FileNameEnd.JSON.getValue(), Enums.FileType.JSON.getValue());
SecurityFileCheckUtil.isValidJson(file);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
// 返回插入和更新的条数
return componentService.readFileAndBulkCreate(file);
}
Expand All @@ -98,6 +101,8 @@ public Result<BundleResultDto> bundleSplit(@RequestParam MultipartFile file) {
return Result.failed(ExceptionEnum.CM307);
}
SecurityFileCheckUtil.validFileName(file.getOriginalFilename());
SecurityFileCheckUtil.checkFileType(file, Enums.FileNameEnd.JSON.getValue(), Enums.FileType.JSON.getValue());
SecurityFileCheckUtil.isValidJson(file);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
return componentService.bundleSplit(file);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
package com.tinyengine.it.controller;

import com.tinyengine.it.common.base.Result;
import com.tinyengine.it.common.enums.Enums;
import com.tinyengine.it.common.exception.ExceptionEnum;
import com.tinyengine.it.common.exception.ServiceException;
import com.tinyengine.it.common.log.SystemControllerLog;
Expand Down Expand Up @@ -46,6 +47,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -248,7 +250,11 @@ public Result<FileResult> updateI18nSingleFile(
if (file.isEmpty()) {
return Result.failed(ExceptionEnum.CM307);
}
Map<String, String> fileTypeMap = new HashMap<>();
fileTypeMap.put(Enums.FileNameEnd.ZIP.getValue(), Enums.FileType.ZIP.getValue());
fileTypeMap.put(Enums.FileNameEnd.JSON.getValue(), Enums.FileType.JSON.getValue());
SecurityFileCheckUtil.validFileName(file.getOriginalFilename());
SecurityFileCheckUtil.checkFileType(file, fileTypeMap);
// 返回插入和更新的条数
result = i18nEntryService.readSingleFileAndBulkCreate(file, id);
}
Expand Down Expand Up @@ -285,6 +291,7 @@ public Result<FileResult> updateI18nMultiFile(
return Result.failed(ExceptionEnum.CM307);
}
SecurityFileCheckUtil.validFileName(file.getOriginalFilename());
SecurityFileCheckUtil.checkFileType(file, Enums.FileNameEnd.JSON.getValue(), Enums.FileType.JSON.getValue());
// 返回插入和更新的条数
result = i18nEntryService.readFilesAndbulkCreate(key, file, id);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.tinyengine.it.common.exception.ExceptionEnum;
import com.tinyengine.it.common.exception.ServiceException;
import com.tinyengine.it.common.log.SystemServiceLog;
import com.tinyengine.it.common.utils.SecurityFileCheckUtil;
import com.tinyengine.it.common.utils.Utils;
import com.tinyengine.it.mapper.I18nEntryMapper;
import com.tinyengine.it.mapper.I18nLangMapper;
Expand Down Expand Up @@ -326,7 +327,8 @@ public Result<FileResult> readSingleFileAndBulkCreate(MultipartFile file, int ho
List<EntriesItem> entriesArr = new ArrayList<>();
String contentType = file.getContentType();

if (Objects.equals(contentType, Enums.MimeType.JSON.getValue())) {
if (Objects.equals(contentType, Enums.FileType.JSON.getValue())) {
SecurityFileCheckUtil.isValidJson(file);
Result<JsonFile> parseJsonFileStreamResult = Utils.parseJsonFileStream(file);
if (!parseJsonFileStreamResult.isSuccess()) {
return Result.failed(ExceptionEnum.CM001);
Expand Down Expand Up @@ -357,6 +359,7 @@ public Result<FileResult> readSingleFileAndBulkCreate(MultipartFile file, int ho
@SystemServiceLog(description = "readFilesAndbulkCreate 批量上传词条数据")
@Override
public Result<FileResult> readFilesAndbulkCreate(String lang, MultipartFile file, int host) throws Exception {
SecurityFileCheckUtil.isValidJson(file);
Result<JsonFile> parseJsonFileStreamResult = Utils.parseJsonFileStream(file);
// 解析 JSON 数据
if (!parseJsonFileStreamResult.isSuccess()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ void testReadSingleFileAndBulkCreate() throws Exception {
when(file.getOriginalFilename()).thenReturn("originalName");
when(file.getName()).thenReturn("123");
when(file.getBytes()).thenReturn("{\"name\":\"value\"}".getBytes(StandardCharsets.UTF_8));
when(file.getInputStream()).thenReturn(IoUtil.toStream("test".getBytes(StandardCharsets.UTF_8)));
when(file.getInputStream()).thenReturn(IoUtil.toStream("{\"name\":\"value\"}".getBytes(StandardCharsets.UTF_8)));

Result<FileResult> result = i18nEntryServiceImpl.readSingleFileAndBulkCreate(file, 0);

Expand All @@ -299,7 +299,7 @@ void testReadFilesAndbulkCreate() throws Exception {
when(file.getOriginalFilename()).thenReturn("originalName");
when(file.getName()).thenReturn("123");
when(file.getBytes()).thenReturn("{\"name\":\"value\"}".getBytes(StandardCharsets.UTF_8));
when(file.getInputStream()).thenReturn(IoUtil.toStream("test".getBytes(StandardCharsets.UTF_8)));
when(file.getInputStream()).thenReturn(IoUtil.toStream("{\"name\":\"value\"}".getBytes(StandardCharsets.UTF_8)));
// file not existed
Result<FileResult> result = i18nEntryServiceImpl.readFilesAndbulkCreate("1", file, 0);
Assertions.assertNull(result.getData());
Expand Down
Loading