From 10b3adcd83c247dd1b2f6023f88fb62d00a55f85 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Tue, 8 Oct 2019 12:20:25 -0400 Subject: [PATCH] GUACAMOLE-893: Fix regression in LDAP causing null filter value to be sent. --- .../guacamole/auth/ldap/ObjectQueryService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java index ebf979274..07e713c63 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java @@ -142,16 +142,21 @@ public class ObjectQueryService { AndNode searchFilter = new AndNode(); 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(); - + // Add equality comparison for each possible attribute attributes.forEach(attribute -> - attributeFilter.addNode(new EqualityNode(attribute, attributeValue)) + attributeFilter.addNode(new EqualityNode(attribute, + (attributeValue != null ? attributeValue : "*"))) ); searchFilter.addNode(attributeFilter); - + return searchFilter; }