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

GUACAOMLE-893: Merge fix for regression in LDAP filter generation.

Browse Source
This commit is contained in:
Mike Jumper
2019-10-11 10:42:54 -07:00
committed by GitHub
parent 981adc94e6 a037146a87
commit 51de21b745
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java
View File

@@ -37,6 +37,7 @@ import org.apache.directory.api.ldap.model.filter.AndNode;
import org.apache.directory.api.ldap.model.filter.EqualityNode; import org.apache.directory.api.ldap.model.filter.EqualityNode;
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.OrNode; import org.apache.directory.api.ldap.model.filter.OrNode;
import org.apache.directory.api.ldap.model.filter.PresenceNode;
import org.apache.directory.api.ldap.model.message.Referral; import org.apache.directory.api.ldap.model.message.Referral;
import org.apache.directory.api.ldap.model.message.SearchRequest; import org.apache.directory.api.ldap.model.message.SearchRequest;
import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.ldap.model.name.Dn;
@@ -142,16 +143,32 @@ public class ObjectQueryService {
AndNode searchFilter = new AndNode(); AndNode searchFilter = new AndNode();
searchFilter.addNode(filter); searchFilter.addNode(filter);
// Include all attributes within OR clause if there are more than one // If no attributes provided, we're done.
if (attributes.size() < 1)
return searchFilter;
// Include all attributes within OR clause
OrNode attributeFilter = new OrNode(); OrNode attributeFilter = new OrNode();
// Add equality comparison for each possible attribute // If value is defined, check each attribute for that value.
attributes.forEach(attribute -> if (attributeValue != null) {
attributeFilter.addNode(new EqualityNode(attribute, attributeValue)) attributes.forEach(attribute ->
); attributeFilter.addNode(new EqualityNode(attribute,
attributeValue))
);
}
// If no value is defined, just check for presence of attribute.
else {
attributes.forEach(attribute ->
attributeFilter.addNode(new PresenceNode(attribute))
);
}
searchFilter.addNode(attributeFilter); searchFilter.addNode(attributeFilter);
logger.trace("Sending LDAP filter: \"{}\"", searchFilter.toString());
return searchFilter; return searchFilter;
} }