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

GUACAMOLE-996: Use "(objectClass=*)" as default group filter.

Browse Source
This commit is contained in:
Michael Jumper
2021-06-25 00:32:06 -07:00
parent cb61fc8312
commit 38c03ddfd7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.directory.api.ldap.model.filter.ExprNode; import org.apache.directory.api.ldap.model.filter.ExprNode;
import org.apache.directory.api.ldap.model.filter.PresenceNode; import org.apache.directory.api.ldap.model.filter.PresenceNode;
import org.apache.directory.api.ldap.model.message.AliasDerefMode; import org.apache.directory.api.ldap.model.message.AliasDerefMode;
import org.apache.directory.api.ldap.model.filter.EqualityNode;
import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.Environment;
@@ -325,12 +324,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 groups. If no filter is specified, * LDAP server for Guacamole groups. If no filter is specified,
* a default of "(objectClass=group)" is returned. * a default of "(objectClass=*)" is used.
* *
* @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 groups that are valid in Guacamole, or * LDAP server for groups that are valid in Guacamole, or
* "(objectClass=group)" if not specified. * "(objectClass=*)" if not specified.
* *
* @throws GuacamoleException * @throws GuacamoleException
* If guacamole.properties cannot be parsed. * If guacamole.properties cannot be parsed.
@@ -338,7 +337,7 @@ public class ConfigurationService {
public ExprNode getGroupSearchFilter() throws GuacamoleException { public ExprNode getGroupSearchFilter() throws GuacamoleException {
return environment.getProperty( return environment.getProperty(
LDAPGuacamoleProperties.LDAP_GROUP_SEARCH_FILTER, LDAPGuacamoleProperties.LDAP_GROUP_SEARCH_FILTER,
new EqualityNode("objectClass","group") new PresenceNode("objectClass")
); );
} }