safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-908: Handle errors during connect/bind/query distinctly. Only rethrow server error if connection or query fails - failure to bind is just an invalid login.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-27 13:26:13 -07:00
parent 6f81584aed
commit 713ecaae2a
1 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
extensions/guacamole-auth-ldap/src/main/java/net/sourceforge/guacamole/net/auth/ldap/LDAPAuthenticationProvider.java
View File

@@ -35,6 +35,7 @@ import java.util.TreeMap;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.auth.Credentials; import org.glyptodon.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.net.auth.ldap.properties.LDAPGuacamoleProperties; import net.sourceforge.guacamole.net.auth.ldap.properties.LDAPGuacamoleProperties;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider; import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
import org.glyptodon.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
@@ -126,42 +127,50 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
@Override @Override
public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentials credentials) throws GuacamoleException { public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentials credentials) throws GuacamoleException {
// Require username
if (credentials.getUsername() == null) {
logger.debug("Anonymous bind is not currently allowed by the LDAP authentication provider.");
return null;
}
// Require password, and do not allow anonymous binding
if (credentials.getPassword() == null
|| credentials.getPassword().length() == 0) {
logger.debug("Anonymous bind is not currently allowed by the LDAP authentication provider.");
return null;
}
// Connect to LDAP server
LDAPConnection ldapConnection;
try { try {
// Require username ldapConnection = new LDAPConnection();
if (credentials.getUsername() == null) {
logger.info("Anonymous bind is not currently allowed by the LDAP authentication provider.");
return null;
}
// Require password, and do not allow anonymous binding
if (credentials.getPassword() == null
|| credentials.getPassword().length() == 0) {
logger.info("Anonymous bind is not currently allowed by the LDAP authentication provider.");
return null;
}
// Connect to LDAP server
LDAPConnection ldapConnection = new LDAPConnection();
ldapConnection.connect( ldapConnection.connect(
GuacamoleProperties.getRequiredProperty(LDAPGuacamoleProperties.LDAP_HOSTNAME), GuacamoleProperties.getRequiredProperty(LDAPGuacamoleProperties.LDAP_HOSTNAME),
GuacamoleProperties.getRequiredProperty(LDAPGuacamoleProperties.LDAP_PORT) GuacamoleProperties.getRequiredProperty(LDAPGuacamoleProperties.LDAP_PORT)
); );
// Get username attribute }
String username_attribute = GuacamoleProperties.getRequiredProperty( catch (LDAPException e) {
LDAPGuacamoleProperties.LDAP_USERNAME_ATTRIBUTE throw new GuacamoleServerException("Unable to connect to LDAP server.", e);
); }
// Get user base DN // Get username attribute
String user_base_dn = GuacamoleProperties.getRequiredProperty( String username_attribute = GuacamoleProperties.getRequiredProperty(
LDAPGuacamoleProperties.LDAP_USER_BASE_DN LDAPGuacamoleProperties.LDAP_USERNAME_ATTRIBUTE
); );
// Construct user DN // Get user base DN
String user_dn = String user_base_dn = GuacamoleProperties.getRequiredProperty(
escapeDN(username_attribute) + "=" + escapeDN(credentials.getUsername()) LDAPGuacamoleProperties.LDAP_USER_BASE_DN
+ "," + user_base_dn; );
// Construct user DN
String user_dn =
escapeDN(username_attribute) + "=" + escapeDN(credentials.getUsername())
+ "," + user_base_dn;
try {
// Bind as user // Bind as user
try { try {
@@ -175,10 +184,19 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
throw new GuacamoleException(e); throw new GuacamoleException(e);
} }
// Get config base DN }
String config_base_dn = GuacamoleProperties.getRequiredProperty( catch (LDAPException e) {
LDAPGuacamoleProperties.LDAP_CONFIG_BASE_DN logger.debug("LDAP bind failed.", e);
); return null;
}
// Get config base DN
String config_base_dn = GuacamoleProperties.getRequiredProperty(
LDAPGuacamoleProperties.LDAP_CONFIG_BASE_DN
);
// Pull all connections
try {
// Find all guac configs for this user // Find all guac configs for this user
LDAPSearchResults results = ldapConnection.search( LDAPSearchResults results = ldapConnection.search(
@@ -248,7 +266,7 @@ public class LDAPAuthenticationProvider extends SimpleAuthenticationProvider {
} }
catch (LDAPException e) { catch (LDAPException e) {
throw new GuacamoleException(e); throw new GuacamoleServerException("Error while querying for connections.", e);
} }
} }