From dac39a1e8a26524e8473f483743c64073f74a5b9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 17:57:58 +0000
Subject: [PATCH] Add logging for test LdapServer actions (#3933)

Signed-off-by: Peter Nied <petern@amazon.com>
(cherry picked from commit b905999f81093fc96db8371df5f96badabb9ff38)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../amazon/dlic/auth/ldap/srv/LdapServer.java | 40 ++++++++++++-------
 src/test/resources/log4j2-test.properties     |  6 +++
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/test/java/com/amazon/dlic/auth/ldap/srv/LdapServer.java b/src/test/java/com/amazon/dlic/auth/ldap/srv/LdapServer.java
index 36bb37494d..64cc1f8ab0 100644
--- a/src/test/java/com/amazon/dlic/auth/ldap/srv/LdapServer.java
+++ b/src/test/java/com/amazon/dlic/auth/ldap/srv/LdapServer.java
@@ -23,9 +23,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
 
 import com.google.common.io.CharStreams;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -153,9 +156,8 @@ private synchronized int configureAndStartServer(String... ldifFiles) throws Exc
         config.setEnforceAttributeSyntaxCompliance(false);
         config.setEnforceSingleStructuralObjectClass(false);
 
-        // config.setLDAPDebugLogHandler(DEBUG_HANDLER);
-        // config.setAccessLogHandler(DEBUG_HANDLER);
-        // config.addAdditionalBindCredentials(configuration.getBindDn(), configuration.getPassword());
+        config.setLDAPDebugLogHandler(new ServerLogger());
+        config.setAccessLogHandler(new ServerLogger());
 
         server = new InMemoryDirectoryServer(config);
 
@@ -214,25 +216,33 @@ private int loadLdifFiles(String... ldifFiles) throws Exception {
         return ldifLoadCount;
     }
 
-    /* private static class DebugHandler extends Handler {
-        private final static Logger LOG = LogManager.getLogger(DebugHandler.class);
+    private static class ServerLogger extends Handler {
+        final Logger logger = LogManager.getLogger(ServerLogger.class);
 
         @Override
-        public void publish(LogRecord logRecord) {
-           //LOG.debug(ToStringBuilder.reflectionToString(logRecord, ToStringStyle.MULTI_LINE_STYLE));
+        public void publish(final LogRecord logRecord) {
+            logger.log(toLog4jLevel(logRecord.getLevel()), logRecord.getMessage(), logRecord.getThrown());
         }
 
         @Override
-        public void flush() {
-
-        }
+        public void flush() {}
 
         @Override
-        public void close() throws SecurityException {
-
+        public void close() throws SecurityException {}
+
+        private Level toLog4jLevel(java.util.logging.Level javaLevel) {
+            switch (javaLevel.getName()) {
+                case "SEVERE":
+                    return Level.ERROR;
+                case "WARNING":
+                    return Level.WARN;
+                case "INFO":
+                    return Level.INFO;
+                case "CONFIG":
+                    return Level.DEBUG;
+                default:
+                    return Level.TRACE;
+            }
         }
     }
-
-    private static final DebugHandler DEBUG_HANDLER = new DebugHandler();
-    */
 }
diff --git a/src/test/resources/log4j2-test.properties b/src/test/resources/log4j2-test.properties
index 3d22ca3765..866b68325c 100644
--- a/src/test/resources/log4j2-test.properties
+++ b/src/test/resources/log4j2-test.properties
@@ -17,6 +17,12 @@ rootLogger.level = warn
 rootLogger.appenderRef.console.ref = console
 rootLogger.appenderRef.file.ref = LOGFILE
 
+# For troubleshooting com.amazon.dlic.auth.ldap.* test cases
+logger.ldapServerLogger.name = com.amazon.dlic.auth.ldap.srv.LdapServer.ServerLogger
+logger.ldapServerLogger.level = info
+logger.ldapAuthBackend.name = com.amazon.dlic.auth.ldap.backend.LDAPAuthorizationBackend
+logger.ldapAuthBackend.level = debug
+
 #logger.resolver.name = org.opensearch.security.resolver
 #logger.resolver.level = trace