From 742b0c4e6586ca738ae0ec304d45ca3c809799e5 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Thu, 27 Dec 2018 10:28:09 -0500
Subject: [PATCH] GUACAMOLE-234: Correctly handle bind failure.

---
 .../apache/guacamole/auth/ldap/LDAPConnectionService.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
index a5ee4b3c5..c2914f7c1 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java
@@ -150,6 +150,8 @@ public class LDAPConnectionService {
             bindRequest.setDn(userDN);
             bindRequest.setCredentials(password);
             ldapConnection.bind(bindRequest);
+            if (ldapConnection.isConnected() && ldapConnection.isAuthenticated())
+                return ldapConnection;
 
         }
 
@@ -162,7 +164,8 @@ public class LDAPConnectionService {
                     CredentialsInfo.USERNAME_PASSWORD);
         }
         
-        return ldapConnection;
+        throw new GuacamoleInvalidCredentialsException("Authentication failed.",
+                CredentialsInfo.USERNAME_PASSWORD);
 
     }