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

GUACAMOLE-893: Fix regression in LDAP causing null filter value to be sent.

Browse Source
This commit is contained in:
Virtually Nick
2019-10-08 12:20:25 -04:00
committed by Nick Couchman
parent 981adc94e6
commit 10b3adcd83
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,16 +142,21 @@ 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 // Add equality comparison for each possible attribute
attributes.forEach(attribute -> attributes.forEach(attribute ->
attributeFilter.addNode(new EqualityNode(attribute, attributeValue)) attributeFilter.addNode(new EqualityNode(attribute,
(attributeValue != null ? attributeValue : "*")))
); );
searchFilter.addNode(attributeFilter); searchFilter.addNode(attributeFilter);
return searchFilter; return searchFilter;
} }