From 38094d45fcc9abf666dadbee19b7e11b768960b8 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 20 Mar 2012 15:47:40 +0100 Subject: [PATCH] SONAR-2084 fix the key of the property sonar.secretKeyPath --- .../src/main/java/org/sonar/api/CoreProperties.java | 2 +- .../src/main/java/org/sonar/api/config/AesCipher.java | 6 +++--- .../test/java/org/sonar/api/config/AesCipherTest.java | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java index dea53e74b72..4899dd09e38 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java @@ -30,7 +30,7 @@ public interface CoreProperties { /** * @since 2.15 */ - String ENCRYPTION_SECRET_KEY_FILE = "sonar.secretKeyFile"; + String ENCRYPTION_SECRET_KEY_PATH = "sonar.secretKeyPath"; /** diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java index 4413b6353bf..279c8f40d5c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/AesCipher.java @@ -95,11 +95,11 @@ final class AesCipher extends Cipher { @VisibleForTesting Key loadSecretFileFromFile(@Nullable String path) throws NoSuchAlgorithmException, InvalidKeySpecException, IOException, InvalidKeyException { if (StringUtils.isBlank(path)) { - throw new IllegalStateException("Secret key not found. Please set the property " + CoreProperties.ENCRYPTION_SECRET_KEY_FILE); + throw new IllegalStateException("Secret key not found. Please set the property " + CoreProperties.ENCRYPTION_SECRET_KEY_PATH); } File file = new File(path); if (!file.exists() || !file.isFile()) { - throw new IllegalStateException("The property " + CoreProperties.ENCRYPTION_SECRET_KEY_FILE + " does not link to a valid file: " + path); + throw new IllegalStateException("The property " + CoreProperties.ENCRYPTION_SECRET_KEY_PATH + " does not link to a valid file: " + path); } String s = FileUtils.readFileToString(file); if (StringUtils.isBlank(s)) { @@ -122,7 +122,7 @@ final class AesCipher extends Cipher { @VisibleForTesting String getPathToSecretKey() { - String path = settings.getClearString(CoreProperties.ENCRYPTION_SECRET_KEY_FILE); + String path = settings.getClearString(CoreProperties.ENCRYPTION_SECRET_KEY_PATH); if (StringUtils.isBlank(path)) { path = new File(FileUtils.getUserDirectoryPath(), ".sonar/sonar-secret.txt").getPath(); } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java index b9f429bc7dd..0b3cc802376 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java @@ -20,7 +20,6 @@ package org.sonar.api.config; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.junit.Test; import org.sonar.api.CoreProperties; @@ -51,7 +50,7 @@ public class AesCipherTest { @Test public void encrypt() throws Exception { Settings settings = new Settings(); - settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_FILE, pathToSecretKey()); + settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_PATH, pathToSecretKey()); AesCipher cipher = new AesCipher(settings); String encryptedText = cipher.encrypt("this is a secret"); @@ -63,7 +62,7 @@ public class AesCipherTest { @Test public void decrypt() throws Exception { Settings settings = new Settings(); - settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_FILE, pathToSecretKey()); + settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_PATH, pathToSecretKey()); AesCipher cipher = new AesCipher(settings); // the following value has been encrypted with the key /org/sonar/api/config/AesCipherTest/aes_secret_key.txt @@ -76,7 +75,7 @@ public class AesCipherTest { public void decrypt_bad_key() throws Exception { URL resource = getClass().getResource("/org/sonar/api/config/AesCipherTest/bad_secret_key.txt"); Settings settings = new Settings(); - settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_FILE, new File(resource.toURI()).getCanonicalPath()); + settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_PATH, new File(resource.toURI()).getCanonicalPath()); AesCipher cipher = new AesCipher(settings); try { @@ -92,7 +91,7 @@ public class AesCipherTest { public void decrypt_other_key() throws Exception { URL resource = getClass().getResource("/org/sonar/api/config/AesCipherTest/other_secret_key.txt"); Settings settings = new Settings(); - settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_FILE, new File(resource.toURI()).getCanonicalPath()); + settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_PATH, new File(resource.toURI()).getCanonicalPath()); AesCipher cipher = new AesCipher(settings); try { @@ -108,7 +107,7 @@ public class AesCipherTest { @Test public void encryptThenDecrypt() throws Exception { Settings settings = new Settings(); - settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_FILE, pathToSecretKey()); + settings.setProperty(CoreProperties.ENCRYPTION_SECRET_KEY_PATH, pathToSecretKey()); AesCipher cipher = new AesCipher(settings); assertThat(cipher.decrypt(cipher.encrypt("foo")), is("foo")); -- 2.39.5