From db9876e736a08a5be538e4b5a45de19e906cd543 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 28 Mar 2017 07:50:08 -0400 Subject: [PATCH] GUACAMOLE-101: Remove connection search filter changes. --- .../auth/ldap/ConfigurationService.java | 20 ------------------- .../auth/ldap/LDAPGuacamoleProperties.java | 10 ---------- .../ldap/connection/ConnectionService.java | 6 ++---- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java index eec032485..c7e4819d1 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java @@ -292,24 +292,4 @@ public class ConfigurationService { ); } - /** - * Returns the search filter that should be used when querying the - * LDAP server for Guacamole connections. If no filter is specified, - * the default of objectClass=guacConfigGroup is returned. - * - * @return - * The search filter that should be used when querying the - * LDAP server for connections for Guacamole, or - * objectClass=guacConfigGroup if no filter is specified. - * - * @throws GuacamoleException - * If guacamole.properties cannot be parsed. - */ - public String getConnectionSearchFilter() throws GuacamoleException { - return environment.getProperty( - LDAPGuacamoleProperties.LDAP_CONNECTION_SEARCH_FILTER, - "(objectClass=guacConfigGroup)" - ); - } - } diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java index 5f49a8c9c..e13264dd8 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java @@ -174,14 +174,4 @@ public class LDAPGuacamoleProperties { }; - /** - * A search filter to apply to connection LDAP queries. - */ - public static final StringGuacamoleProperty LDAP_CONNECTION_SEARCH_FILTER = new StringGuacamoleProperty() { - - @Override - public String getName() { return "ldap-connection-search-filter"; } - - }; - } diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java index 04e57f0f2..d256ebb3b 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java @@ -227,9 +227,7 @@ public class ConnectionService { StringBuilder connectionSearchFilter = new StringBuilder(); // Add the prefix to the search filter, prefix filter searches for guacConfigGroups with the userDN as the member attribute value - connectionSearchFilter.append("(&"); - connectionSearchFilter.append(confService.getConnectionSearchFilter()); - connectionSearchFilter.append("(|(member="); + connectionSearchFilter.append("(&(objectClass=guacConfigGroup)(|(member="); connectionSearchFilter.append(escapingService.escapeLDAPSearchFilter(userDN)); connectionSearchFilter.append(")"); @@ -241,7 +239,7 @@ public class ConnectionService { LDAPSearchResults userRoleGroupResults = ldapConnection.search( groupBaseDN, LDAPConnection.SCOPE_SUB, - "(&(!" + confService.getConnectionSearchFilter() + ")(member=" + escapingService.escapeLDAPSearchFilter(userDN) + "))", + "(&(!(objectClass=guacConfigGroup))(member=" + escapingService.escapeLDAPSearchFilter(userDN) + "))", null, false, confService.getLDAPSearchConstraints()