OP-10610 : Minor login fixes. Log statements to debug login issues.

gate-ldap/src/main/java/com/opsmx/spinnaker/gate/security/ldap/LDAPConnectionClosedException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 OpsMx, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.opsmx.spinnaker.gate.security.ldap;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
+public class LDAPConnectionClosedException extends RuntimeException {
+
+  public LDAPConnectionClosedException(String message) {
+    super(message);
+  }
+}

gate-ldap/src/main/java/com/opsmx/spinnaker/gate/security/ldap/RetryOnExceptionAuthManager.java

@@ -35,14 +35,19 @@ public RetryOnExceptionAuthManager(AuthenticationManager delegate) {
 
   @Override
   public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+    Authentication auth = null;
     while (true) {
       try {
-        return delegate.authenticate(authentication);
+        auth = delegate.authenticate(authentication);
+        log.info("Authenticated without connection issue");
+        break;
       } catch (UncategorizedLdapException ldapException) {
         exceptionOccurred(ldapException);
         continue;
       }
     }
+
+    return auth;
   }
 
   /*
@@ -73,12 +78,13 @@ private void waitUntilNextTry() {
    * @throws Exception
    * @param e
    */
-  private void exceptionOccurred(UncategorizedLdapException e) throws UncategorizedLdapException {
+  private void exceptionOccurred(UncategorizedLdapException e)
+      throws LDAPConnectionClosedException {
     numRetries--;
     if (!shouldRetry()) {
-      throw e;
+      throw new LDAPConnectionClosedException(e.getMessage());
     } else {
-      log.warn("Ldap exception occurred so retrying the authentication, The exception is : {}", e);
+      log.info("Ldap exception occurred so retrying the authentication, The exception is : {}", e);
     }
     waitUntilNextTry();
   }

gate-ldap/src/test/java/com/opsmx/spinnaker/gate/security/ldap/RetryOnExceptionAuthManagerTest.java

@@ -29,7 +29,7 @@ public void test1() {
     try {
       fixture.authenticate(authentication);
       fail("Should fail when try attempts are finished");
-    } catch (UncategorizedLdapException e) {
+    } catch (LDAPConnectionClosedException e) {
 
     } catch (Exception e) {
       fail("UncategorizedLdapException is expected");