Skip to content

also use key from security.secretKey property for encrypting/decrypting #1242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
markusokon wants to merge 1 commit into from
+8 −2
Closed

also use key from security.secretKey property for encrypting/decrypting #1242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions core/spring/src/main/java/org/apache/syncope/core/spring/security/Encryptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@ public static Encryptor getInstance() {
}

public static Encryptor getInstance(final String secretKey) {
String actualKey = StringUtils.isBlank(secretKey) ? DEFAULT_SECRET_KEY : secretKey;

LOG.info("using custom encryptor");

// this is the change done by us which changes the secretKey usage in the following way:
// old: first secretKey parameter, then default secretKey
// new: first secretKey parameter, then secretKey from security.secretKey property, then default secretKey
SecurityProperties securityProperties = ApplicationContextProvider.getApplicationContext().getBean(SecurityProperties.class);
String secretKeyFromProperties = securityProperties.getSecretKey() == null ? DEFAULT_SECRET_KEY : securityProperties.getSecretKey();
String actualKey = StringUtils.isBlank(secretKey) ? secretKeyFromProperties : secretKey;
Encryptor instance = INSTANCES.get(actualKey);
if (instance == null) {
instance = new Encryptor(actualKey);
Expand Down