from copy import deepcopy
import ldap
-from django.db.models.fields import Field
from django.db.models.query import QuerySet as BaseQuerySet
from django.db.models.query_utils import Q
from django.db.models.sql import Query as BaseQuery
import ldapdb
+def escape_ldap_filter(value):
+ value = str(value)
+ return value.replace('\\', '\\5c') \
+ .replace('*', '\\2a') \
+ .replace('(', '\\28') \
+ .replace(')', '\\29') \
+ .replace('\0', '\\00')
+
class Constraint(BaseConstraint):
"""
An object that can be passed to WhereNode.add() and knows how to
from django.db.models.base import ObjectDoesNotExist
if lookup_type == 'endswith':
- params = ["*%s" % value]
+ params = ["*%s" % escape_ldap_filter(value)]
elif lookup_type == 'startswith':
- params = ["%s*" % value]
+ params = ["%s*" % escape_ldap_filter(value)]
+ elif lookup_type == 'contains':
+ params = ["*%s*" % escape_ldap_filter(value)]
elif lookup_type == 'exact':
- params = [value]
+ params = [escape_ldap_filter(value)]
elif lookup_type == 'in':
- params = [v for v in value]
+ params = [escape_ldap_filter(v) for v in value]
else:
raise TypeError("Field has invalid lookup: %s" % lookup_type)
if isinstance(item, WhereNode):
bits.append(item.as_sql())
continue
- if len(item) == 4:
- # django 1.1
- (table, column, type), x, y, values = item
- else:
- # django 1.0
- table, column, type, x, y, values = item
+ (table, column, type), x, y, values = item
equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
if len(equal_bits) == 1:
clause = equal_bits[0]