aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.go42
1 files changed, 23 insertions, 19 deletions
diff --git a/main.go b/main.go
index 745d3fd..f717382 100644
--- a/main.go
+++ b/main.go
@@ -329,8 +329,8 @@ func (server *Server) handleSearchInternal(state *State, w ldap.ResponseWriter,
// If attribute is not in request, exclude it from returned entry
if len(r.Attributes()) > 0 {
found := false
- for _, need := range r.Attributes() {
- if string(need) == attr {
+ for _, requested := range r.Attributes() {
+ if strings.EqualFold(string(requested), attr) {
found = true
break
}
@@ -389,32 +389,36 @@ func applyFilter(entry Entry, filter message.Filter) (bool, error) {
return !res, nil
} else if fPresent, ok := filter.(message.FilterPresent); ok {
what := string(fPresent)
- log.Printf("Present filter: %s", what)
- if _, ok := entry[what]; ok {
- return true, nil
+ // Case insensitive search
+ for desc := range entry {
+ if strings.EqualFold(what, desc) {
+ return true, nil
+ }
}
return false, nil
} else if fEquality, ok := filter.(message.FilterEqualityMatch); ok {
desc := string(fEquality.AttributeDesc())
target := string(fEquality.AssertionValue())
- if value, ok := entry[desc]; ok {
- if vstr, ok := value.(string); ok {
- // If we have one value for the key, match exactly
- return vstr == target, nil
- } else if vlist, ok := value.([]string); ok {
- // If we have several values for the key, one must match
- for _, val := range vlist {
- if val == target {
- return true, nil
+ // Case insensitive attribute search
+ for entry_desc, value := range entry {
+ if strings.EqualFold(entry_desc, desc) {
+ if vstr, ok := value.(string); ok {
+ // If we have one value for the key, match exactly
+ return vstr == target, nil
+ } else if vlist, ok := value.([]string); ok {
+ // If we have several values for the key, one must match
+ for _, val := range vlist {
+ if val == target {
+ return true, nil
+ }
}
+ return false, nil
+ } else {
+ panic(fmt.Sprintf("Invalid value: %#v", value))
}
- return false, nil
- } else {
- panic(fmt.Sprintf("Invalid value: %#v", value))
}
- } else {
- return false, nil
}
+ return false, nil
} else {
return false, fmt.Errorf("Unsupported filter: %#v %T", filter, filter)
}