summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2015-04-10 17:15:50 +0200
committerOlivier Dony <odo@openerp.com>2015-04-10 17:15:50 +0200
commit856bc6f2b147970245f96e26d882f114c32e035c (patch)
tree4f4fc15d4c271c2ccf5ffd09ab85152595fcacb8
parent39010d38567a4d679cbdb8c0e21cffec6c3bb6b0 (diff)
[FIX] apply same visibility rules as base
-rw-r--r--addons/auth_crypt/auth_crypt.py3
-rw-r--r--openerp/addons/base/res/res_users.py10
2 files changed, 10 insertions, 3 deletions
diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index c5bd5799017..a7e3a826223 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -22,6 +22,8 @@ _logger = logging.getLogger(__name__)
magic_md5 = '$1$'
magic_sha256 = '$5$'
+openerp.addons.base.res.res_users.USER_PRIVATE_FIELDS.append('password_crypt')
+
def gen_salt(length=8, symbols=None):
if symbols is None:
symbols = ascii_letters + digits
@@ -173,5 +175,4 @@ class res_users(osv.osv):
# Reraise password incorrect
raise
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 1dcae1f657e..c678deff47f 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -34,6 +34,10 @@ from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
+
+# Only users who can modify the user (incl. the user herself) see the real contents of these fields
+USER_PRIVATE_FIELDS = ['password']
+
class groups(osv.osv):
_name = "res.groups"
_description = "Access Groups"
@@ -277,8 +281,10 @@ class res_users(osv.osv):
def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
def override_password(o):
- if 'password' in o and ('id' not in o or o['id'] != uid):
- o['password'] = '********'
+ if ('id' not in o or o['id'] != uid):
+ for f in USER_PRIVATE_FIELDS:
+ if f in o:
+ o[f] = '********'
return o
if fields and (ids == [uid] or ids == uid):