You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2017/11/15 22:45:17 UTC
directory-fortress-core git commit: FC-229 - don't ever write service
account pws, even to debug log
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 62a271a79 -> d41075cd0
FC-229 - don't ever write service account pws, even to debug log
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/d41075cd
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/d41075cd
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/d41075cd
Branch: refs/heads/master
Commit: d41075cd0b2557579282d745476837a2974055a8
Parents: 62a271a
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Nov 15 16:45:12 2017 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Nov 15 16:45:12 2017 -0600
----------------------------------------------------------------------
.../fortress/core/ldap/LdapConnectionProvider.java | 10 +++++-----
.../apache/directory/fortress/core/util/Config.java | 14 +++++++++++++-
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d41075cd/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
index 26f57b7..3832d87 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
@@ -123,7 +123,7 @@ public class LdapConnectionProvider
IS_SSL = ( Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ) != null &&
Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ).equalsIgnoreCase( "true" ) &&
Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) != null &&
- Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) != null );
+ Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW, true ) != null );
String host = Config.getInstance().getProperty( GlobalIds.LDAP_HOST, "localhost" );
int port = Config.getInstance().getInt( GlobalIds.LDAP_PORT, 389 );
@@ -159,11 +159,11 @@ public class LdapConnectionProvider
if ( EncryptUtil.isEnabled() )
{
adminPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( GlobalIds
- .LDAP_ADMIN_POOL_PW ) );
+ .LDAP_ADMIN_POOL_PW, true ) );
}
else
{
- adminPw = Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW );
+ adminPw = Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW, true );
}
config.setCredentials( adminPw );
@@ -236,11 +236,11 @@ public class LdapConnectionProvider
String logPw;
if ( EncryptUtil.isEnabled() )
{
- logPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( LDAP_LOG_POOL_PW ) );
+ logPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( LDAP_LOG_POOL_PW, true ) );
}
else
{
- logPw = Config.getInstance().getProperty( LDAP_LOG_POOL_PW );
+ logPw = Config.getInstance().getProperty( LDAP_LOG_POOL_PW, true );
}
logConfig.setCredentials( logPw );
poolFactory = new ValidatingPoolableLdapConnectionFactory( logConfig );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d41075cd/src/main/java/org/apache/directory/fortress/core/util/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index c4f3c6f..679e483 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -126,11 +126,23 @@ public final class Config
*/
public String getProperty( String name )
{
+ return getProperty( name, false );
+ }
+
+ /**
+ * Gets the prop attribute as String value from the apache commons cfg component.
+ *
+ * @param name contains the name of the property.
+ * @param nologvalue if true will not output this prop's value to the debug logger.
+ * @return contains the value associated with the property or null if not not found.
+ */
+ public String getProperty( String name, boolean nologvalue )
+ {
String value = null;
if ( config != null )
{
value = ( String ) config.getProperty( name );
- LOG.debug( "getProperty name [{}] value [{}]", name, value );
+ LOG.debug( "getProperty name [{}] value [{}]", name, nologvalue ? "****" : value );
}
else
{