Merge pull request #930 from fastrde/fix_scope_whole_subtree

marle3003 · web-flow · commit b58c26e5c4cd · 2026-04-17T19:03:12.000+02:00
fix(ldap): ScopeWholeSubtree wasn't handled by serveSearch
diff --git a/providers/directory/search.go b/providers/directory/search.go
@@ -80,6 +80,10 @@ func (d *Directory) serveSearch(rw ldap.ResponseWriter, r *ldap.Request) {
 				if dn := strings.Join(parts[1:], ","); dn != msg.BaseDN {
 					continue
 				}
+			case ldap.ScopeWholeSubtree:
+				if !strings.HasSuffix(strings.ToLower(e.Dn), strings.ToLower(msg.BaseDN)) {
+					continue
+				}
 			}
 			if d.skip(&e, msg.BaseDN) {
 				continue

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,10 @@ func (d Directory) serveSearch(rw ldap.ResponseWriter, r ldap.Request) {`
`80`	`80`	`if dn := strings.Join(parts[1:], ","); dn != msg.BaseDN {`
`81`	`81`	`continue`
`82`	`82`	`}`
	`83`	`+ case ldap.ScopeWholeSubtree:`
	`84`	`+ if !strings.HasSuffix(strings.ToLower(e.Dn), strings.ToLower(msg.BaseDN)) {`
	`85`	`+ continue`
	`86`	`+ }`
`83`	`87`	`}`
`84`	`88`	`if d.skip(&e, msg.BaseDN) {`
`85`	`89`	`continue`