Merge lp:~dreis-pt/ocb-addons/7.0-bug1079476-dr into lp:ocb-addons

[Daniel Reis]

[Daniel Reis (dreis-pt)]

I need to add that I'm using this fix in production.

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Daniel, thanks for looking into this!

What I read on the Internet about python-ldap and unicode confirms what Olivier Dony writes on the bug report [1]. Any input that is passed on to python-ldap should be encoded as utf-8 instead of the default Python unicode. I can confirm this simply by logging on using a user name with a unicode character. This gives basically the same error as the one from the bug report. I think it would be much appreciated if you completed the mission to cover all strings passed to the LDAP server.

Code nit in l.18: given that the 'conf' dictionary comes from a raw sql query, it could be that conf['ldap_password'] is None. The following is probably safer in that case

    (conf['ldap_password'] or '').encode("utf-8")

[1] https://bugs.launchpad.net/openobject-addons/+bug/1079476/comments/5

review: Needs Fixing

[Stefan Rijnhart (Opener) (stefan-opener)]

Setting to work-in-progress after 5 weeks of no response. Can you backport your fix to openobject-addons when you are happy with it?

[Daniel Reis (dreis-pt)]

Yes, I'll get back to it as soon as I can; just been too busy lately.

Unmerged revisions

9511. By Daniel Reis on 2013-09-18

Fix bug 1079476

=== modified file 'auth_ldap/users_ldap.py'
--- auth_ldap/users_ldap.py	2013-08-12 10:29:50 +0000
+++ auth_ldap/users_ldap.py	2013-09-18 16:29:47 +0000
@@ -102,7 +102,7 @@
             if results and len(results) == 1:
                 dn = results[0][0]
                 conn = self.connect(conf)
-                conn.simple_bind_s(dn, password)
+                conn.simple_bind_s(dn, password.encode("utf-8"))
                 conn.unbind()
                 entry = results[0]
         except ldap.INVALID_CREDENTIALS:
@@ -138,7 +138,7 @@
         try:
             conn = self.connect(conf)
             conn.simple_bind_s(conf['ldap_binddn'] or '',
-                               conf['ldap_password'] or '')
+                               conf['ldap_password'].encode("utf-8") or '')
             results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE,
                                      filter, retrieve_attributes, timeout=60)
             conn.unbind()