From efd6ebf088c4bf35b33457eaca7223895a54fcb8 Mon Sep 17 00:00:00 2001
From: Vladimir Kotal <vlada@devnull.cz>
Date: Thu, 9 Apr 2020 17:28:57 +0200
Subject: [PATCH] add username and timeout to toString()

---
 .../opengrok/auth/plugin/ldap/LdapServer.java | 27 ++++++++++++++++---
 .../opengrok/auth/plugin/LdapFacadeTest.java  |  3 ++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapServer.java b/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapServer.java
index 216b1ec08ca..0ae5d50ca18 100644
--- a/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapServer.java
+++ b/plugins/src/main/java/opengrok/auth/plugin/ldap/LdapServer.java
@@ -67,6 +67,13 @@ public LdapServer(String server) {
         this.url = server;
     }
 
+    public LdapServer(String server, String username, String password) {
+        this(prepareEnv());
+        this.url = server;
+        this.username = username;
+        this.password = password;
+    }
+
     public LdapServer(Hashtable<String, String> env) {
         this.env = env;
     }
@@ -134,7 +141,7 @@ public synchronized boolean isWorking() {
      * @return the new connection or null
      */
     private synchronized LdapContext connect() {
-        LOGGER.log(Level.INFO, "Server {0} connecting", this.url);
+        LOGGER.log(Level.INFO, "Connecting to LDAP server {0} ", this.toString());
 
         if (errorTimestamp > 0 && errorTimestamp + interval > System.currentTimeMillis()) {
             LOGGER.log(Level.INFO, "LDAP server {0} is down", this.url);
@@ -159,7 +166,7 @@ private synchronized LdapContext connect() {
                 ctx = new InitialLdapContext(env, null);
                 ctx.reconnect(null);
                 ctx.setRequestControls(null);
-                LOGGER.log(Level.INFO, "Connected to LDAP server {0}", env.get(Context.PROVIDER_URL));
+                LOGGER.log(Level.INFO, "Connected to LDAP server {0}", this.toString());
                 errorTimestamp = 0;
             } catch (NamingException ex) {
                 LOGGER.log(Level.INFO, "LDAP server {0} is not responding", env.get(Context.PROVIDER_URL));
@@ -252,6 +259,20 @@ private static Hashtable<String, String> prepareEnv() {
 
     @Override
     public String toString() {
-        return getUrl();
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(getUrl());
+
+        if (getConnectTimeout() > 0) {
+            sb.append(" timeout: ");
+            sb.append(getConnectTimeout());
+        }
+
+        if (getUsername() != null && !getUsername().isEmpty()) {
+            sb.append(" username: ");
+            sb.append(getUsername());
+        }
+
+        return sb.toString();
     }
 }
diff --git a/plugins/src/test/java/opengrok/auth/plugin/LdapFacadeTest.java b/plugins/src/test/java/opengrok/auth/plugin/LdapFacadeTest.java
index 696c8bf1421..3549f6a5e08 100644
--- a/plugins/src/test/java/opengrok/auth/plugin/LdapFacadeTest.java
+++ b/plugins/src/test/java/opengrok/auth/plugin/LdapFacadeTest.java
@@ -43,7 +43,8 @@ public void testConnectTimeoutInheritance() {
     public void testToString() {
         Configuration config = new Configuration();
         config.setServers(Arrays.asList(new LdapServer("http://foo.foo"),
-                new LdapServer("http://bar.bar")));
+                new LdapServer("http://bar.bar",
+                        "cn=FOOBAR,l=amer,dc=example,dc=com", "MySecretPassword")));
         config.setSearchBase("dc=foo,dc=com");
         int timeoutValue = 42;
         config.setConnectTimeout(timeoutValue);