# -*- coding: utf-8 -*-
#
# django-ldapdb
-# Copyright (C) 2009 Bolloré telecom
+# Copyright (C) 2009-2010 Bolloré telecom
# See AUTHORS file for a full list of contributors.
#
# This program is free software: you can redistribute it and/or modify
import ldap
from django.conf import settings
+from django.db.backends import BaseDatabaseOperations
def convert(field, value, func):
if not value or field == 'jpegPhoto':
return [ func(x) for x in value ]
else:
return func(value)
-
-class LdapConnection():
+
+def escape_ldap_filter(value):
+ value = str(value)
+ return value.replace('\\', '\\5c') \
+ .replace('*', '\\2a') \
+ .replace('(', '\\28') \
+ .replace(')', '\\29') \
+ .replace('\0', '\\00')
+
+class DatabaseOperations(BaseDatabaseOperations):
+ def quote_name(self, name):
+ return name
+
+class LdapConnection(object):
def __init__(self, server, bind_dn, bind_password):
self.connection = ldap.initialize(server)
self.connection.simple_bind_s(bind_dn, bind_password)
+ self.charset = "utf-8"
+ self.ops = DatabaseOperations()
def add_s(self, dn, modlist):
mods = []
for field, value in modlist:
- converted = convert(field, value, lambda x: x.encode('utf-8'))
+ converted = convert(field, value, lambda x: x.encode(self.charset))
if isinstance(converted, list):
mods.append((field, converted))
else:
mods.append((field, [converted]))
- return self.connection.add_s(dn, mods)
+ return self.connection.add_s(dn.encode(self.charset), mods)
def delete_s(self, dn):
- return self.connection.delete_s(dn)
+ return self.connection.delete_s(dn.encode(self.charset))
def modify_s(self, dn, modlist):
mods = []
for op, field, value in modlist:
- mods.append((op, field, convert(field, value, lambda x: x.encode('utf-8'))))
- return self.connection.modify_s(dn, mods)
+ mods.append((op, field, convert(field, value, lambda x: x.encode(self.charset))))
+ return self.connection.modify_s(dn.encode(self.charset), mods)
+
+ def rename_s(self, dn, newrdn):
+ return self.connection.rename_s(dn.encode(self.charset), newrdn.encode(self.charset))
def search_s(self, base, scope, filterstr, attrlist):
- results = self.connection.search_s(base, scope, filterstr, attrlist)
+ results = self.connection.search_s(base, scope, filterstr.encode(self.charset), attrlist)
+ output = []
for dn, attrs in results:
for field in attrs:
if field == "member" or field == "memberUid":
- attrs[field] = convert(field, attrs[field], lambda x: x.decode('utf-8'))
+ attrs[field] = convert(field, attrs[field], lambda x: x.decode(self.charset))
else:
- attrs[field] = convert(field, attrs[field][0], lambda x: x.decode('utf-8'))
- return results
+ attrs[field] = convert(field, attrs[field][0], lambda x: x.decode(self.charset))
+ output.append((dn.decode(self.charset), attrs))
+ return output
# FIXME: is this the right place to initialize the LDAP connection?
connection = LdapConnection(settings.LDAPDB_SERVER_URI,