Skip to content

Commit 849452d

Browse files
authored
Merge pull request #1704 from lowcoder-org/fix/encryption_backward_compatible
Fixed issue when salt and password is empty for encryption
2 parents 95b5e9b + 4f8d8df commit 849452d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionServiceImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ public EncryptionServiceImpl(
2525
Encrypt encrypt = commonConfig.getEncrypt();
2626
String saltInHex = Hex.encodeHexString(encrypt.getSalt().getBytes());
2727
this.textEncryptor = Encryptors.text(encrypt.getPassword(), saltInHex);
28-
String saltInHexForNodeServer = Hex.encodeHexString(commonConfig.getJsExecutor().getSalt().getBytes());
29-
this.textEncryptorForNodeServer = Encryptors.text(commonConfig.getJsExecutor().getPassword(), saltInHexForNodeServer);
28+
if (!commonConfig.getJsExecutor().getSalt().isEmpty() && !commonConfig.getJsExecutor().getPassword().isEmpty()) {
29+
String saltInHexForNodeServer = Hex.encodeHexString(commonConfig.getJsExecutor().getSalt().getBytes());
30+
this.textEncryptorForNodeServer = Encryptors.text(commonConfig.getJsExecutor().getPassword(), saltInHexForNodeServer);
31+
} else this.textEncryptorForNodeServer = null;
3032
}
3133

3234
@Override

0 commit comments

Comments
 (0)