geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1022043 - /geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
Date Wed, 13 Oct 2010 09:24:45 GMT
Author: rwonly
Date: Wed Oct 13 09:24:44 2010
New Revision: 1022043

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

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

Modified: geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java?rev=1022043&r1=1022042&r2=1022043&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
(original)
+++ geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
Wed Oct 13 09:24:44 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;
     }
 
 }



Mime
View raw message