svn commit: r1624864 - in /tomee/tomee/trunk/container/openejb-core/src: main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java test/java/org/apache/openejb/util/PropertyPlaceHolderTest.java

[rmannibucau]

Author: rmannibucau
Date: Sun Sep 14 15:57:18 2014
New Revision: 1624864

URL: http://svn.apache.org/r1624864
Log:
TOMEE-1346 allow to cipher resources values

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
    
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PropertyPlaceHolderTest.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java?rev=1624864&r1=1624863&r2=1624864&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
 Sun Sep 14 15:57:18 2014
@@ -19,6 +19,9 @@ package org.apache.openejb.util;
 
 import org.apache.commons.lang3.text.StrLookup;
 import org.apache.commons.lang3.text.StrSubstitutor;
+import org.apache.openejb.cipher.PasswordCipher;
+import org.apache.openejb.cipher.PasswordCipherException;
+import org.apache.openejb.cipher.PasswordCipherFactory;
 import org.apache.openejb.loader.SystemInstance;
 
 import java.util.Map;
@@ -36,6 +39,8 @@ public final class PropertyPlaceHolderHe
         
SUBSTITUTOR.setValueDelimiter(System.getProperty("openejb.placehodler.delimiter",
 ":-")); // default one of [lang3]
     }
 
+    public static final String CIPHER_PREFIX = "cipher:";
+
     private PropertyPlaceHolderHelper() {
         // no-op
     }
@@ -54,7 +59,23 @@ public final class PropertyPlaceHolderHe
         if (!value.equals(raw) && value.startsWith("java:")) {
             value = value.substring(5);
         }
-        return value.replace(PREFIX, "").replace(SUFFIX, "");
+
+        final String replace = value.replace(PREFIX, "").replace(SUFFIX, "");
+        if (replace.startsWith(CIPHER_PREFIX)) {
+            final String algo = replace.substring(CIPHER_PREFIX.length(), 
replace.indexOf(':', CIPHER_PREFIX.length() + 1));
+            PasswordCipher cipher = null;
+            try {
+                cipher = PasswordCipherFactory.getPasswordCipher(algo);
+            } catch (final PasswordCipherException ex) {
+                try {
+                    cipher = 
PasswordCipher.class.cast(Thread.currentThread().getContextClassLoader().loadClass(algo).newInstance());
+                } catch (final Exception e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+            return cipher.decrypt(replace.substring(CIPHER_PREFIX.length() + 
algo.length()).toCharArray());
+        }
+        return replace;
     }
 
     public static String value(final String aw) {

Modified: 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PropertyPlaceHolderTest.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PropertyPlaceHolderTest.java?rev=1624864&r1=1624863&r2=1624864&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PropertyPlaceHolderTest.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PropertyPlaceHolderTest.java
 Sun Sep 14 15:57:18 2014
@@ -32,6 +32,13 @@ public class PropertyPlaceHolderTest {
     }
 
     @Test
+    public void cipher() {
+        SystemInstance.get().setProperty("PropertyPlaceHolderTest", 
"cipher:Static3DES:xMH5uM1V9vQzVUv5LG7YLA==");
+
+        assertEquals("Passw0rd", 
PropertyPlaceHolderHelper.simpleValue("${PropertyPlaceHolderTest}"));
+    }
+
+    @Test
     public void simpleReplace() {
         SystemInstance.get().setProperty("PropertyPlaceHolderTest", "ok");