zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(storage): 存储管理 S3 存储功能修复 (#51)

Browse Source 
1、S3存储管理功能及文件上传回显测试通过
2、修复S3协议存储无法编辑
3、对S3私钥配置信息脱密
This commit is contained in:
kils 2024-04-23 20:21:41 +08:00 committed by GitHub
parent a2e4f9a28b
commit f71c4c226f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java
View File

@ -31,9 +31,11 @@ public class RsaProperties {
* 私钥
*/
public static final String PRIVATE_KEY;
public static final String PUBLIC_KEY;
static {
PRIVATE_KEY = SpringUtil.getProperty("continew-starter.security.crypto.private-key");
PUBLIC_KEY = SpringUtil.getProperty("continew-starter.security.crypto.public-key");
}
private RsaProperties() {

12
continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java
View File

@ -44,6 +44,18 @@ public class SecureUtils {
return Base64.encode(SecureUtil.rsa(null, publicKey).encrypt(data, KeyType.PublicKey));
}
/**
* 公钥加密
*
* @param data 要加密的内容
* @return 公钥加密并 Base64 加密后的内容
*/
public static String encryptByRsaPublicKey(String data) {
String publicKey = RsaProperties.PUBLIC_KEY;
ValidationUtils.throwIfBlank(publicKey, "请配置 RSA 公钥");
return encryptByRsaPublicKey(data, publicKey);
}
/**
* 私钥解密
*

8
continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java
View File

@ -16,7 +16,6 @@
package top.continew.admin.system.model.resp;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.enums.DisEnableStatusEnum;
@ -72,9 +71,14 @@ public class StorageResp extends BaseDetailResp {
* 私有密钥
*/
@Schema(description = "私有密钥", example = "")
@JsonIgnore
private String secretKey;
/**
* 私有密钥加密串
*/
@Schema(description = "私有密钥加密串", example = "")
private String secretKeyEncrypted;
/**
* 终端节点
*/

23
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
View File

@ -28,6 +28,7 @@ import org.dromara.x.file.storage.core.FileStorageServiceBuilder;
import org.dromara.x.file.storage.core.platform.FileStorage;
import org.springframework.stereotype.Service;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.util.SecureUtils;
import top.continew.admin.system.enums.StorageTypeEnum;
import top.continew.admin.system.mapper.StorageMapper;
import top.continew.admin.system.model.entity.StorageDO;
@ -37,6 +38,7 @@ import top.continew.admin.system.model.resp.StorageResp;
import top.continew.admin.system.service.FileService;
import top.continew.admin.system.service.StorageService;
import top.continew.starter.core.constant.StringConstants;
import top.continew.starter.core.util.ExceptionUtils;
import top.continew.starter.core.util.URLUtils;
import top.continew.starter.core.util.validate.CheckUtils;
import top.continew.starter.core.util.validate.ValidationUtils;
@ -61,16 +63,37 @@ public class StorageServiceImpl extends BaseServiceImpl<StorageMapper, StorageDO
@Resource
private FileService fileService;
@Override
protected void fill(Object obj) {
super.fill(obj);
if (obj instanceof StorageResp resp && StrUtil.isNotBlank(resp.getSecretKey())) {
resp.setSecretKeyEncrypted(SecureUtils.encryptByRsaPublicKey(resp.getSecretKey()));
resp.setSecretKey(StrUtil.hide(resp.getSecretKey(), 4, resp.getSecretKey().length() - 3));
}
}
@Override
protected void beforeAdd(StorageReq req) {
decryptSecretKey(req);
CheckUtils.throwIf(Boolean.TRUE.equals(req.getIsDefault()) && this.isDefaultExists(null), "请先取消原有默认存储");
String code = req.getCode();
CheckUtils.throwIf(this.isCodeExists(code, null), "新增失败，[{}] 已存在", code);
this.load(req);
}
private void decryptSecretKey(StorageReq req) {
if (!StorageTypeEnum.S3.equals(req.getType())) {
return;
}
String secretKey = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(req.getSecretKey()));
ValidationUtils.throwIfNull(secretKey, "密钥解密失败");
req.setSecretKey(secretKey);
}
@Override
protected void beforeUpdate(StorageReq req, Long id) {
decryptSecretKey(req);
String code = req.getCode();
CheckUtils.throwIf(this.isCodeExists(code, id), "修改失败，[{}] 已存在", code);
DisEnableStatusEnum newStatus = req.getStatus();