pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Modifs for LDAP Tiny ERP"

Browse Source 
This reverts commit e5c3828aeed61a6210eaef7d43062067cca6a47d.

bzr revid: ced-a06d0abef258d22c7c2f249d267b7c638f196868
This commit is contained in:
ced
2007-07-11 07:33:16 +00:00
parent 3388852590
commit 73685cfd44
1 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/users_ldap/users_ldap.py
+9 -27
View File
@@ -36,7 +36,7 @@ try:
except ImportError:
import netsvc
logger = netsvc.Logger()
logger.notifyChannel("init", netsvc.LOG_ERROR, "could not import ldap!")
logger.notifyChannel("init", netsvc.LOG_WARNING, "could not import ldap!")
class res_company(osv.osv):
_inherit = "res.company"
@@ -62,7 +62,7 @@ def ldap_login(oldfnc):
for res_company in cr.dictfetchall():
try:
l = ldap.open(res_company['ldap_server'])
if l.simple_bind(res_company['ldap_binddn'], res_company['ldap_password']):
if l.simple_bind_s(res_company['ldap_binddn'], res_company['ldap_password']):
base = res_company['ldap_base']
scope = ldap.SCOPE_SUBTREE
filter = res_company['ldap_filter']%(login,)
@@ -74,8 +74,9 @@ def ldap_login(oldfnc):
continue
if result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
dn=result_data[0][0]
name=result_data[0][1]['cn']
name=result_data[0][1]['cn'][0]
if l.bind_s(dn, passwd):
l.unbind()
cr.execute("select id from res_users where login=%s",(login.encode('utf-8'),))
res = cr.fetchone()
if res:
@@ -88,6 +89,7 @@ def ldap_login(oldfnc):
cr.commit()
cr.close()
return res
l.unbind()
except Exception, e:
continue
cr.close()
@@ -108,11 +110,11 @@ def ldap_check(oldfnc):
if state in ('installed', 'to upgrade', 'to remove'):
users_obj = pooler.get_pool(cr.dbname).get('res.users')
user = users_obj.browse(cr, 1, uid)
if user:# and user.company_id.ldap_server and user.company_id.ldap_binddn:
if user and user.company_id.ldap_server and user.company_id.ldap_binddn:
company = user.company_id
try:
l = ldap.open(company.ldap_server)
if l.simple_bind(company.ldap_binddn, company.ldap_password):
if l.simple_bind_s(company.ldap_binddn, company.ldap_password):
base = company['ldap_base']
scope = ldap.SCOPE_SUBTREE
filter = company['ldap_filter']%(user.login,)
@@ -124,33 +126,13 @@ def ldap_check(oldfnc):
dn=result_data[0][0]
name=result_data[0][1]['cn']
if l.bind_s(dn, passwd):
l.unbind()
security._uid_cache[uid] = passwd
cr.close()
return True
l.unbind()
except Exception, e:
pass
cr.execute("select id, name, ldap_server, ldap_binddn, ldap_password, ldap_filter, ldap_base from res_company where ldap_server != '' and ldap_binddn != ''")
for res_company in cr.dictfetchall():
try:
l = ldap.open(res_company['ldap_server'])
if l.simple_bind(res_company['ldap_binddn'], res_company['ldap_password']):
base = res_company['ldap_base']
scope = ldap.SCOPE_SUBTREE
filter = res_company['ldap_filter']%(user.login,)
retrieve_attributes = None
result_id = l.search(base, scope, filter, retrieve_attributes)
timeout = 60
result_type, result_data = l.result(result_id, timeout)
if result_data and result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
dn=result_data[0][0]
name=result_data[0][1]['cn']
if l.bind_s(dn, passwd):
security._uid_cache[uid] = passwd
cr.close()
return True
except Exception, e:
pass
cr.close()
return oldfnc(db, uid, passwd)
return _ldap_check