zhangwenzan
/
crm_pro-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 加密修改

This commit is contained in:
zhangwenzan 2025-09-17 15:52:27 +08:00
parent 16526e11e9
commit 8dc69d4870
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/kakarote/core/security/EncryptionService.java
View File

@ -5,6 +5,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.crypto.AEADBadTagException;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.KeyGenerator; import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
@ -123,7 +124,9 @@ public class EncryptionService {
// 执行解密 // 执行解密
byte[] plaintext = cipher.doFinal(decoded); byte[] plaintext = cipher.doFinal(decoded);
return new String(plaintext, StandardCharsets.UTF_8); return new String(plaintext, StandardCharsets.UTF_8);
} catch (Exception e) { } catch (AEADBadTagException e) {
return decryptAes(ciphertext);
}catch (Exception e) {
log.error("确定性AES解密失败", e); log.error("确定性AES解密失败", e);
throw new SecurityException("数据解密失败", e); throw new SecurityException("数据解密失败", e);
} }

29
core/src/main/java/com/kakarote/core/security/converter/SensitiveDataConverter.java
View File

@ -33,6 +33,16 @@ public class SensitiveDataConverter extends AbstractJsonTypeHandler<String> impl
this.encryptionService = encryptionService; this.encryptionService = encryptionService;
} }
public String getNullableResult(ResultSet resultSet, String s) throws SQLException {
String value = resultSet.getString(s);
if (value != null && value.startsWith(Const.ENCRYPTED_PREFIX)) {
// 修复：使用deterministicDecryptAes方法解密由deterministicEncryptAes加密的数据
String encryptedValue = value.substring(Const.ENCRYPTED_PREFIX.length());
value = getEncryptionService().deterministicDecryptAes(encryptedValue);
}
return value;
}
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
SensitiveDataConverter.applicationContext = applicationContext; SensitiveDataConverter.applicationContext = applicationContext;
@ -54,22 +64,14 @@ public class SensitiveDataConverter extends AbstractJsonTypeHandler<String> impl
preparedStatement.setString(i, s); preparedStatement.setString(i, s);
} }
@Override
public String getNullableResult(ResultSet resultSet, String s) throws SQLException {
String value = resultSet.getString(s);
if (value != null && value.startsWith(Const.ENCRYPTED_PREFIX)) {
// 修复：移除前缀后再解密
value = getEncryptionService().decryptAes(value.substring(Const.ENCRYPTED_PREFIX.length()));
}
return value;
}
@Override @Override
public String getNullableResult(ResultSet resultSet, int i) throws SQLException { public String getNullableResult(ResultSet resultSet, int i) throws SQLException {
String value = resultSet.getString(i); String value = resultSet.getString(i);
if (value != null && value.startsWith(Const.ENCRYPTED_PREFIX)) { if (value != null && value.startsWith(Const.ENCRYPTED_PREFIX)) {
// 修复：移除前缀后再解密 // 修复：使用deterministicDecryptAes方法解密由deterministicEncryptAes加密的数据
value = getEncryptionService().decryptAes(value.substring(Const.ENCRYPTED_PREFIX.length())); String encryptedValue = value.substring(Const.ENCRYPTED_PREFIX.length());
value = getEncryptionService().deterministicDecryptAes(encryptedValue);
} }
return value; return value;
} }
@ -78,8 +80,9 @@ public class SensitiveDataConverter extends AbstractJsonTypeHandler<String> impl
public String getNullableResult(CallableStatement callableStatement, int i) throws SQLException { public String getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
String value = callableStatement.getString(i); String value = callableStatement.getString(i);
if (value != null && value.startsWith(Const.ENCRYPTED_PREFIX)) { if (value != null && value.startsWith(Const.ENCRYPTED_PREFIX)) {
// 修复：移除前缀后再解密 // 修复：使用deterministicDecryptAes方法解密由deterministicEncryptAes加密的数据
value = getEncryptionService().decryptAes(value.substring(Const.ENCRYPTED_PREFIX.length())); String encryptedValue = value.substring(Const.ENCRYPTED_PREFIX.length());
value = getEncryptionService().deterministicDecryptAes(encryptedValue);
} }
return value; return value;
} }