[REVERT] base_crypt: incorrect/unreviewed fix in rev 8058
bzr revid: odo@openerp.com-20121116105231-tujpbbhcd2g8xkfu
This commit is contained in:
parent
fb1c81a9d3
commit
ebd61d8c00
|
@ -201,20 +201,6 @@ class users(osv.osv):
|
|||
# Return early if no one has a login name like that.
|
||||
return False
|
||||
|
||||
# Check if the authentification is made with OpenID. In this case, don't encrypt the password
|
||||
cr.execute('SELECT id FROM ir_module_module WHERE name = \'auth_openid\' and state = \'installed\'')
|
||||
if cr.rowcount:
|
||||
cr.execute( 'SELECT password, id FROM res_users WHERE login=%s AND openid_key = %s AND active',
|
||||
(login.encode('utf-8'),password.encode('utf-8')))
|
||||
if cr.rowcount:
|
||||
# Check if the encrypted password matches against the one in the db.
|
||||
cr.execute("""UPDATE res_users SET login_date=now() AT TIME ZONE 'UTC' WHERE id=%s AND openid_key=%s AND active RETURNING id""",
|
||||
(int(id), password.encode('utf-8')))
|
||||
res = cr.fetchone()
|
||||
cr.commit()
|
||||
if res:
|
||||
return res[0]
|
||||
|
||||
stored_pw = self.maybe_encrypt(cr, stored_pw, id)
|
||||
|
||||
if not stored_pw:
|
||||
|
|
Loading…
Reference in New Issue