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 2018/09/10 19:53:59 UTC

directory-fortress-core git commit: + slapd log coordinates to possible system.property settings

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 0bc4825f8 -> 5b0601abb


+ slapd log coordinates to possible system.property settings


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/5b0601ab
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/5b0601ab
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/5b0601ab

Branch: refs/heads/master
Commit: 5b0601abbb224aa7140923a09eafb17819142cfa
Parents: 0bc4825
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Sep 10 14:53:53 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Sep 10 14:53:53 2018 -0500

----------------------------------------------------------------------
 .../directory/fortress/core/GlobalIds.java      |  9 +++++
 .../core/ldap/LdapConnectionProvider.java       | 18 ++++------
 .../directory/fortress/core/util/Config.java    | 38 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b0601ab/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 20e13d3..0678a85 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -482,6 +482,15 @@ public final class GlobalIds
     public static final String LDAP_ADMIN_POOL_UID = "admin.user";
     public static final String LDAP_ADMIN_POOL_PW = "admin.pw";
 
+    /**
+     * Used for ldap connection pool of log users.
+     */
+    public static final String LDAP_LOG_POOL_UID = "log.admin.user";
+    public static final String LDAP_LOG_POOL_PW = "log.admin.pw";
+    public static final String LDAP_LOG_POOL_MIN = "min.log.conn";
+    public static final String LDAP_LOG_POOL_MAX = "max.log.conn";
+
+
     // Used for TLS/SSL client-side configs:
     public static final String ENABLE_LDAP_SSL = "enable.ldap.ssl";
     public static final String ENABLE_LDAP_SSL_DEBUG = "enable.ldap.ssl.debug";

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b0601ab/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 8359df6..fb09931 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
@@ -60,12 +60,6 @@ public class LdapConnectionProvider
 
     private static final String CLS_NM = LdapConnectionProvider.class.getName();
     private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
-
-    private static final String LDAP_LOG_POOL_UID = "log.admin.user";
-    private static final String LDAP_LOG_POOL_PW = "log.admin.pw";
-    private static final String LDAP_LOG_POOL_MIN = "min.log.conn";
-    private static final String LDAP_LOG_POOL_MAX = "max.log.conn";
-
     private static final String ENABLE_LDAP_STARTTLS = "enable.ldap.starttls";
     private boolean IS_SSL;
 
@@ -129,8 +123,8 @@ public class LdapConnectionProvider
         int port = Config.getInstance().getInt( GlobalIds.LDAP_PORT, 389 );
         int min = Config.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MIN, 1 );
         int max = Config.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MAX, 10 );
-        int logmin = Config.getInstance().getInt( LDAP_LOG_POOL_MIN, 1 );
-        int logmax = Config.getInstance().getInt( LDAP_LOG_POOL_MAX, 10 );
+        int logmin = Config.getInstance().getInt( GlobalIds.LDAP_LOG_POOL_MIN, 1 );
+        int logmax = Config.getInstance().getInt( GlobalIds.LDAP_LOG_POOL_MAX, 10 );
         LOG.info( "LDAP POOL:  host=[{}], port=[{}], min=[{}], max=[{}]", host, port, min, max );
 
         LdapConnectionConfig config = new LdapConnectionConfig();
@@ -211,7 +205,7 @@ public class LdapConnectionProvider
 
         // This pool of access log connections is used by {@link org.apache.directory.fortress.AuditMgr}.
         // To enable, set {@code log.admin.user} && {@code log.admin.pw} inside fortress.properties file:
-        if ( StringUtils.isNotEmpty( LDAP_LOG_POOL_UID ) && StringUtils.isNotEmpty( LDAP_LOG_POOL_PW ) )
+        if ( StringUtils.isNotEmpty( GlobalIds.LDAP_LOG_POOL_UID ) && StringUtils.isNotEmpty( GlobalIds.LDAP_LOG_POOL_PW ) )
         {
             // Initializing the log pool in static block requires static props set within fortress.properties.
             // To make this dynamic requires moving this code outside of static block AND storing the connection
@@ -232,15 +226,15 @@ public class LdapConnectionProvider
                     (), null, true ) );
             }
 
-            logConfig.setName( Config.getInstance().getProperty( LDAP_LOG_POOL_UID, "" ) );
+            logConfig.setName( Config.getInstance().getProperty( GlobalIds.LDAP_LOG_POOL_UID, "" ) );
             String logPw;
             if ( EncryptUtil.isEnabled() )
             {
-                logPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( LDAP_LOG_POOL_PW, true ) );
+                logPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( GlobalIds.LDAP_LOG_POOL_PW, true ) );
             }
             else
             {
-                logPw = Config.getInstance().getProperty( LDAP_LOG_POOL_PW, true );
+                logPw = Config.getInstance().getProperty( GlobalIds.LDAP_LOG_POOL_PW, true );
             }
             logConfig.setCredentials( logPw );
             poolFactory = new ValidatingPoolableLdapConnectionFactory( logConfig );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b0601ab/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 131329e..90d169f 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
@@ -62,6 +62,10 @@ public final class Config
     private static final String EXT_LDAP_ADMIN_POOL_PW = "fortress.admin.pw";
     private static final String EXT_LDAP_ADMIN_POOL_MIN = "fortress.min.admin.conn";
     private static final String EXT_LDAP_ADMIN_POOL_MAX = "fortress.max.admin.conn";
+    private static final String EXT_LDAP_LOG_POOL_UID = "fortress.log.user";
+    private static final String EXT_LDAP_LOG_POOL_PW = "fortress.log.pw";
+    private static final String EXT_LDAP_LOG_POOL_MIN = "fortress.min.log.conn";
+    private static final String EXT_LDAP_LOG_POOL_MAX = "fortress.max.log.conn";
     private static final String EXT_ENABLE_LDAP_SSL = "fortress.enable.ldap.ssl";
     private static final String EXT_ENABLE_LDAP_SSL_DEBUG = "fortress.enable.ldap.ssl.debug";
     private static final String EXT_TRUST_STORE = "fortress.trust.store";
@@ -590,6 +594,40 @@ public final class Config
             LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MAX, szValue );
         }
 
+        // Check to see if the log pool uid has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_LOG_POOL_UID );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_LOG_POOL_UID, szValue );
+            // never display ldap admin userid name to log:
+            LOG.info( "getExternalConfig override name [{}]", GlobalIds.LDAP_LOG_POOL_UID );
+        }
+
+        // Check to see if the log pool pw has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_LOG_POOL_PW );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_LOG_POOL_PW, szValue );
+            // never display password of any type to log:
+            LOG.info( "getExternalConfig override name [{}]", GlobalIds.LDAP_LOG_POOL_PW );
+        }
+
+        // Check to see if the log pool min connections has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_LOG_POOL_MIN );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_LOG_POOL_MIN, szValue );
+            LOG.info( PREFIX, GlobalIds.LDAP_LOG_POOL_MIN, szValue );
+        }
+
+        // Check to see if the log pool max connections has been overridden by a system property:
+        szValue = System.getProperty( EXT_LDAP_LOG_POOL_MAX );
+        if( StringUtils.isNotEmpty( szValue ))
+        {
+            config.setProperty( GlobalIds.LDAP_LOG_POOL_MAX, szValue );
+            LOG.info( PREFIX, GlobalIds.LDAP_LOG_POOL_MAX, szValue );
+        }
+
         // Check to see if ssl enabled parameter has been overridden by a system property:
         szValue = System.getProperty( EXT_ENABLE_LDAP_SSL );
         if( StringUtils.isNotEmpty( szValue ))