manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 修复加密失败的问题.

Browse Source
This commit is contained in:
lijiahangmax
2025-01-22 22:32:10 +08:00
parent aeb161a482
commit 4e5730f31f
7 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/RsaEncryptor.java → orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/RsaDecryptor.java
View File

@@ -23,21 +23,13 @@
package org.dromara.visor.common.interfaces;
/**
* rsa 加密器
* rsa 解密器
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/1/5 20:58
*/
public interface RsaEncryptor {
/**
* 加密
*
* @param value value
* @return value
*/
String encrypt(String value);
public interface RsaDecryptor {
/**
* 解密

26
orion-visor-common/src/main/java/org/dromara/visor/common/utils/RsaEncryptUtils.java → orion-visor-common/src/main/java/org/dromara/visor/common/utils/RsaParamDecryptUtils.java
View File

@@ -23,30 +23,20 @@
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.interfaces.RsaEncryptor;
import org.dromara.visor.common.interfaces.RsaDecryptor;
/**
* rsa 加密工具类
* rsa 参数解密工具类
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/1/5 21:13
*/
public class RsaEncryptUtils {
public class RsaParamDecryptUtils {
private static RsaEncryptor delegate;
private static RsaDecryptor delegate;
private RsaEncryptUtils() {
}
/**
* 加密
*
* @param value value
* @return value
*/
public static String encrypt(String value) {
return delegate.encrypt(value);
private RsaParamDecryptUtils() {
}
/**
@@ -59,12 +49,12 @@ public class RsaEncryptUtils {
return delegate.decrypt(value);
}
public static void setDelegate(RsaEncryptor delegate) {
if (RsaEncryptUtils.delegate != null) {
public static void setDelegate(RsaDecryptor delegate) {
if (RsaParamDecryptUtils.delegate != null) {
// unmodified
throw Exceptions.state();
}
RsaEncryptUtils.delegate = delegate;
RsaParamDecryptUtils.delegate = delegate;
}
}

18
orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/OrionEncryptAutoConfiguration.java
View File

@@ -25,12 +25,12 @@ package org.dromara.visor.framework.encrypt.configuration;
import org.dromara.visor.common.config.ConfigStore;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.interfaces.AesEncryptor;
import org.dromara.visor.common.interfaces.RsaEncryptor;
import org.dromara.visor.common.interfaces.RsaDecryptor;
import org.dromara.visor.common.utils.AesEncryptUtils;
import org.dromara.visor.common.utils.RsaEncryptUtils;
import org.dromara.visor.common.utils.RsaParamDecryptUtils;
import org.dromara.visor.framework.encrypt.configuration.config.AesEncryptConfig;
import org.dromara.visor.framework.encrypt.core.impl.AesEncryptorImpl;
import org.dromara.visor.framework.encrypt.core.impl.RsaEncryptorImpl;
import org.dromara.visor.framework.encrypt.core.impl.RsaDecryptorImpl;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -63,15 +63,15 @@ public class OrionEncryptAutoConfiguration {
/**
* @param configStore configStore
* @return rsa 加密器
* @return rsa 参数解密器
*/
@Bean
public RsaEncryptor rsaEncryptor(ConfigStore configStore) {
// 加密器
RsaEncryptor encryptor = new RsaEncryptorImpl(configStore);
public RsaDecryptor rsaParamDecryptor(ConfigStore configStore) {
// 解密器
RsaDecryptor decryptor = new RsaDecryptorImpl(configStore);
// 设置工具类
RsaEncryptUtils.setDelegate(encryptor);
return encryptor;
RsaParamDecryptUtils.setDelegate(decryptor);
return decryptor;
}
}

21
orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/RsaEncryptorImpl.java → orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/RsaDecryptorImpl.java
View File

@@ -26,10 +26,11 @@ import cn.orionsec.kit.lang.utils.crypto.RSA;
import org.dromara.visor.common.config.ConfigRef;
import org.dromara.visor.common.config.ConfigStore;
import org.dromara.visor.common.constant.ConfigKeys;
import org.dromara.visor.common.interfaces.RsaEncryptor;
import org.dromara.visor.common.interfaces.RsaDecryptor;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
import java.util.Arrays;
import java.util.stream.Collectors;
/**
* rsa 加密器
@@ -38,25 +39,21 @@ import java.security.interfaces.RSAPublicKey;
* @version 1.0.0
* @since 2025/1/7 11:32
*/
public class RsaEncryptorImpl implements RsaEncryptor {
public class RsaDecryptorImpl implements RsaDecryptor {
private final ConfigRef<RSAPublicKey> publicKey;
private static final String SPLIT = "\\|";
private final ConfigRef<RSAPrivateKey> privateKey;
public RsaEncryptorImpl(ConfigStore configStore) {
this.publicKey = configStore.ref(ConfigKeys.ENCRYPT_PUBLIC_KEY, RSA::getPublicKey);
public RsaDecryptorImpl(ConfigStore configStore) {
this.privateKey = configStore.ref(ConfigKeys.ENCRYPT_PRIVATE_KEY, RSA::getPrivateKey);
}
@Override
public String encrypt(String value) {
return RSA.encrypt(value, publicKey.value);
}
@Override
public String decrypt(String value) {
return RSA.decrypt(value, privateKey.value);
return Arrays.stream(value.split(SPLIT))
.map(s -> RSA.decrypt(s, privateKey.value))
.collect(Collectors.joining());
}
}

4
orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java
View File

@@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.utils.RsaEncryptUtils;
import org.dromara.visor.common.utils.RsaParamDecryptUtils;
import org.dromara.visor.common.utils.Valid;
import java.io.IOException;
@@ -51,7 +51,7 @@ public class ParamDecryptDeserializer extends JsonDeserializer<String> {
return value;
}
// 解密参数
String decrypt = RsaEncryptUtils.decrypt(value);
String decrypt = RsaParamDecryptUtils.decrypt(value);
return Valid.notNull(decrypt, ErrorMessage.DECRYPT_ERROR);
}

4
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java
View File

@@ -29,7 +29,7 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy;
import org.dromara.visor.common.utils.AesEncryptUtils;
import org.dromara.visor.common.utils.RsaEncryptUtils;
import org.dromara.visor.common.utils.RsaParamDecryptUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.module.asset.dao.HostIdentityDAO;
import org.dromara.visor.module.asset.dao.HostKeyDAO;
@@ -134,7 +134,7 @@ public class HostSshConfigStrategy extends AbstractGenericsDataStrategy<HostSshC
// 检查新密码
String newPassword = Valid.notBlank(after.getPassword(), ErrorMessage.PASSWORD_MISSING);
// 解密密码
newPassword = RsaEncryptUtils.decrypt(newPassword);
newPassword = RsaParamDecryptUtils.decrypt(newPassword);
Valid.notBlank(newPassword, ErrorMessage.DECRYPT_ERROR);
// 设置密码
after.setPassword(AesEncryptUtils.encryptAsString(newPassword));

33
orion-visor-ui/src/utils/rsa.ts
View File

@@ -2,6 +2,9 @@ import { JSEncrypt } from 'jsencrypt';
import { useCacheStore } from '@/store';
import { Message } from '@arco-design/web-vue';
// 分块大小
const BLOCK_SIZE = 100;
// 加密
export const encrypt = async (data: string | undefined): Promise<string | undefined> => {
// 为空直接返回
@@ -9,14 +12,32 @@ export const encrypt = async (data: string | undefined): Promise<string | undefi
return data;
}
// 获取公钥
const { encrypt } = await useCacheStore().loadSystemSetting();
const publicKey = (await useCacheStore().loadSystemSetting()).encrypt?.publicKey;
const encryptor = new JSEncrypt();
encryptor.setPublicKey(encrypt?.publicKey);
// 加密
const value = encryptor.encrypt(data);
if (value === false) {
encryptor.setPublicKey(publicKey);
try {
// 分块加密
const chunks = splitString(data);
const encryptedChunks = chunks.map(chunk => {
const encrypted = encryptor.encrypt(chunk);
if (encrypted === false) {
throw new Error();
}
return encrypted;
});
return encryptedChunks.join('|');
} catch (error) {
Message.error('数据加密失败');
throw new Error('数据加密失败');
}
return value;
};
// 分割字符串
const splitString = (str: string): string[] => {
const chunks: string[] = [];
for (let i = 0; i < str.length; i += BLOCK_SIZE) {
chunks.push(str.slice(i, i + BLOCK_SIZE));
}
return chunks;
};