Ignore extra spaces in baseDN and attributes when creating LDAP search request

pkg/auth/ldaputil/query.go

@@ -3,6 +3,7 @@ package ldaputil
 import (
 	"fmt"
 	"strings"
+	"unicode"
 
 	"github.com/golang/glog"
 	"gopkg.in/ldap.v2"
@@ -104,11 +105,17 @@ type LDAPQueryOnAttribute struct {
 // NewSearchRequest creates a new search request from the identifying query by internalizing the value of
 // the attribute to be filtered as well as any attributes that need to be recovered
 func (o *LDAPQueryOnAttribute) NewSearchRequest(attributeValue string, attributes []string) (*ldap.SearchRequest, error) {
+	removeSpaces := func(r rune) rune {
+		if unicode.IsSpace(r) {
+			return -1
+		}
+		return r
+	}
 	if strings.EqualFold(o.QueryAttribute, "dn") {
 		if _, err := ldap.ParseDN(attributeValue); err != nil {
 			return nil, fmt.Errorf("could not search by dn, invalid dn value: %v", err)
 		}
-		if !strings.Contains(attributeValue, o.BaseDN) {
+		if !strings.Contains(strings.Map(removeSpaces, attributeValue), strings.Map(removeSpaces, o.BaseDN)) {
 			return nil, NewQueryOutOfBoundsError(attributeValue, o.BaseDN)
 		}
 		return o.buildDNQuery(attributeValue, attributes), nil

pkg/auth/ldaputil/query_test.go

@@ -142,6 +142,33 @@ func TestNewSearchRequest(t *testing.T) {
 			},
 			expectedError: false,
 		},
+		{
+			name: "valid dn query with additional attributes that contain spaces",
+			options: LDAPQueryOnAttribute{
+				LDAPQuery: LDAPQuery{
+					BaseDN:       DefaultBaseDN,
+					Scope:        DefaultScope,
+					DerefAliases: DefaultDerefAliases,
+					TimeLimit:    DefaultTimeLimit,
+					Filter:       DefaultFilter,
+				},
+				QueryAttribute: "DN",
+			},
+			attributeValue: "uid=john, o=users, dc=example, dc=com",
+			attributes:     append(DefaultAttributes, []string{"email", "phone"}...),
+			expectedRequest: &ldap.SearchRequest{
+				BaseDN:       "uid=john, o=users, dc=example, dc=com",
+				Scope:        ldap.ScopeBaseObject,
+				DerefAliases: int(DefaultDerefAliases),
+				SizeLimit:    DefaultSizeLimit,
+				TimeLimit:    DefaultTimeLimit,
+				TypesOnly:    DefaultTypesOnly,
+				Filter:       "(objectClass=*)",
+				Attributes:   append(DefaultAttributes, []string{"email", "phone"}...),
+				Controls:     DefaultControls,
+			},
+			expectedError: false,
+		},
 		{
 			name: "invalid dn query out of bounds",
 			options: LDAPQueryOnAttribute{