You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by rw...@apache.org on 2010/10/13 11:25:15 UTC

svn commit: r1022044 - /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java

Author: rwonly
Date: Wed Oct 13 09:25:15 2010
New Revision: 1022044

URL: http://svn.apache.org/viewvc?rev=1022044&view=rev
Log:
GERONIMO-5424 Encrypt truststore pass for tomcat web ssl connector

Modified:
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java?rev=1022044&r1=1022043&r2=1022044&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java Wed Oct 13 09:25:15 2010
@@ -57,7 +57,7 @@ public enum EncryptionSetting {
         if (name == null) throw new NullPointerException("Name missing");
         if (type == null) throw new NullPointerException("type missing");
         if (!String.class.getName().equals(type)) return PLAINTEXT;
-        return (name.toLowerCase().indexOf("password") > -1)? ENCRYPTED: PLAINTEXT;
+        return (name.toLowerCase().contains("password") || name.toLowerCase().contains("keystorepass") || name.toLowerCase().contains("truststorepass"))? ENCRYPTED: PLAINTEXT;
     }
 
 }