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

GUACAMOLE-234: Adjust LDAP filters.

Browse Source
This commit is contained in:
Nick Couchman
2018-12-15 12:50:32 -05:00
committed by Virtually Nick
parent 7825f57b99
commit 72dad76d42
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java
View File

@@ -304,12 +304,12 @@ public class ConfigurationService {
/** /**
* Returns the search filter that should be used when querying the * Returns the search filter that should be used when querying the
* LDAP server for Guacamole users. If no filter is specified, * LDAP server for Guacamole users. If no filter is specified,
* a default of "(objectClass=*)" is returned. * a default of "(objectClass=user)" is returned.
* *
* @return * @return
* The search filter that should be used when querying the * The search filter that should be used when querying the
* LDAP server for users that are valid in Guacamole, or * LDAP server for users that are valid in Guacamole, or
* "(objectClass=*)" if not specified. * "(objectClass=user)" if not specified.
* *
* @throws GuacamoleException * @throws GuacamoleException
* If guacamole.properties cannot be parsed. * If guacamole.properties cannot be parsed.
@@ -317,7 +317,7 @@ public class ConfigurationService {
public ExprNode getUserSearchFilter() throws GuacamoleException { public ExprNode getUserSearchFilter() throws GuacamoleException {
return environment.getProperty( return environment.getProperty(
LDAPGuacamoleProperties.LDAP_USER_SEARCH_FILTER, LDAPGuacamoleProperties.LDAP_USER_SEARCH_FILTER,
new EqualityNode("objectClass","*") new EqualityNode("objectClass","user")
); );
} }

2
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java
View File

@@ -87,7 +87,7 @@ public class UserGroupService {
// Read any object as a group if LDAP is not being used for connection // Read any object as a group if LDAP is not being used for connection
// storage (guacConfigGroup) // storage (guacConfigGroup)
return new EqualityNode("objectClass","*"); return new EqualityNode("objectClass","group");
} }