Merge pull request #94 from bnasslahsen/filters-custom-property-source

Add missing filters for customPropertySourceChain
cyberark · May 10, 2023 · cbb2202 · cbb2202
2 parents 547363a + ff8146b
commit cbb2202
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/com/cyberark/conjur/springboot/constant/ConjurConstant.java b/src/main/java/com/cyberark/conjur/springboot/constant/ConjurConstant.java
@@ -57,4 +57,20 @@ public class ConjurConstant {
 	 * The constant SPRING_UTIL
 	 */
 	public static final String SPRING_UTIL = "SPRING_UTIL";
+
+	/**
+	 * The constant ACTUATOR_PREFIX.
+	 */
+	public static final String ACTUATOR_PREFIX = "management";
+
+	/**
+	 * The constant LOGGING_PREFIX.
+	 */
+	public static final String LOGGING_PREFIX = "logging";
+
+	/**
+	 * The constant KUBERNETES_PREFIX.
+	 */
+	public static final String KUBERNETES_PREFIX = "kubernetes";
+
 }
diff --git a/src/main/java/com/cyberark/conjur/springboot/service/CustomPropertySourceChain.java b/src/main/java/com/cyberark/conjur/springboot/service/CustomPropertySourceChain.java
@@ -56,8 +56,8 @@ public Object getProperty(String key) {
 
 		if (!(key.startsWith(ConjurConstant.SPRING_VAR)) && !(key.startsWith(ConjurConstant.SERVER_VAR))
 				&& !(key.startsWith(ConjurConstant.ERROR)) && !(key.startsWith(ConjurConstant.SPRING_UTIL))
-				&& !(key.startsWith(ConjurConstant.CONJUR_PREFIX))) {
-
+				&& !(key.startsWith(ConjurConstant.CONJUR_PREFIX)) && !(key.startsWith(ConjurConstant.ACTUATOR_PREFIX))
+				&& !(key.startsWith(ConjurConstant.LOGGING_PREFIX)) && !(key.startsWith(ConjurConstant.KUBERNETES_PREFIX))) {
 			try {
 				String account = ConjurConnectionManager.getAccount(secretsApi);
 				String secretValue = secretsApi.getSecret(account, ConjurConstant.CONJUR_KIND, key);