Skip to content

Commit 4e39ce4

Browse files
committed
解密逻辑移到save接口
1 parent f67b357 commit 4e39ce4

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

magic-api/src/main/java/org/ssssssss/magicapi/core/service/MagicResourceStorage.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.ssssssss.magicapi.core.model.MagicEntity;
55
import org.ssssssss.magicapi.core.service.MagicResourceService;
66
import org.ssssssss.magicapi.utils.JsonUtils;
7-
import org.ssssssss.magicapi.utils.ROT13Utils;
87

98
import java.nio.charset.StandardCharsets;
109

@@ -40,8 +39,7 @@ default boolean allowRoot() {
4039
}
4140

4241
default T read(byte[] bytes) {
43-
String encrypt = new String(bytes, StandardCharsets.UTF_8);
44-
String content = ROT13Utils.decrypt(encrypt);
42+
String content = new String(bytes, StandardCharsets.UTF_8);
4543
if (requiredScript()) {
4644
String separator = separatorWithCRLF;
4745
int index = content.indexOf(separator);

magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
import org.ssssssss.magicapi.core.service.MagicResourceService;
1313
import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest;
1414
import org.ssssssss.magicapi.utils.IoUtils;
15+
import org.ssssssss.magicapi.utils.ROT13Utils;
1516

1617
import java.io.IOException;
18+
import java.nio.charset.StandardCharsets;
1719
import java.util.*;
1820
import java.util.function.Function;
1921

@@ -72,12 +74,14 @@ public JsonBean<Boolean> delete(String id, MagicHttpServletRequest request) {
7274
@ResponseBody
7375
public JsonBean<String> saveFile(@PathVariable("folder") String folder, String auto, MagicHttpServletRequest request) throws IOException {
7476
byte[] bytes = IoUtils.bytes(request.getInputStream());
77+
String encrypt = new String(bytes, StandardCharsets.UTF_8);
78+
String decrypt = ROT13Utils.decrypt(encrypt);
7579
MagicEntity entity = configuration.getMagicDynamicRegistries().stream()
7680
.map(MagicDynamicRegistry::getMagicResourceStorage)
7781
.filter(it -> Objects.equals(it.folder(), folder))
7882
.findFirst()
7983
.orElseThrow(() -> new InvalidArgumentException(GROUP_NOT_FOUND))
80-
.read(bytes);
84+
.read(decrypt.getBytes(StandardCharsets.UTF_8));
8185
isTrue(allowVisit(request, Authorization.SAVE, entity), PERMISSION_INVALID);
8286
// 自动保存的代码,和旧版代码对比,如果一致,则不保存,直接返回。
8387
if (entity ==null){

0 commit comments

Comments
 (0)