From 66341605e6ea5a6f4bc8d110e98ff753701aa1ab Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 18 Apr 2014 09:58:06 +0200 Subject: [PATCH] SONAR-4781 Properties starting with "sonar.web." can't be encrypted in sonar.properties --- .../src/main/java/org/sonar/application/AesCipher.java | 2 +- .../src/main/java/org/sonar/application/Props.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sonar-application/src/main/java/org/sonar/application/AesCipher.java b/sonar-application/src/main/java/org/sonar/application/AesCipher.java index d006146a7e6..e778b0ebc18 100644 --- a/sonar-application/src/main/java/org/sonar/application/AesCipher.java +++ b/sonar-application/src/main/java/org/sonar/application/AesCipher.java @@ -48,7 +48,7 @@ final class AesCipher extends Cipher { /** * Duplication from CoreProperties.ENCRYPTION_SECRET_KEY_PATH */ - private static final String ENCRYPTION_SECRET_KEY_PATH = "sonar.secretKeyPath"; + static final String ENCRYPTION_SECRET_KEY_PATH = "sonar.secretKeyPath"; private String pathToSecretKey; diff --git a/sonar-application/src/main/java/org/sonar/application/Props.java b/sonar-application/src/main/java/org/sonar/application/Props.java index 51a6cdfe49e..dbe24636d0e 100644 --- a/sonar-application/src/main/java/org/sonar/application/Props.java +++ b/sonar-application/src/main/java/org/sonar/application/Props.java @@ -101,7 +101,7 @@ class Props { } static Properties decrypt(Properties properties) { - Encryption encryption = new Encryption(null); + Encryption encryption = new Encryption(properties.getProperty(AesCipher.ENCRYPTION_SECRET_KEY_PATH)); Properties result = new Properties(); for (Map.Entry entry : properties.entrySet()) { -- 2.39.5