Commit 4f8d8df

author

Thomasr

committed

Fixed issue when salt and password is empty for encryption

1 parent 95b5e9b commit 4f8d8dfCopy full SHA for 4f8d8df

File tree

-2

lines changed

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

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,10 @@ public EncryptionServiceImpl(`
`25`	`25`	`Encrypt encrypt = commonConfig.getEncrypt();`
`26`	`26`	`String saltInHex = Hex.encodeHexString(encrypt.getSalt().getBytes());`
`27`	`27`	`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;`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`@Override`

Comments

(0)