From 20f69bbce9c9fa6d84ec1937dd99bb3c66dfca90 Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Mon, 7 Sep 2015 11:04:56 +0200 Subject: [PATCH] [FIX] res.users: remove check_super duplication Closes #8403 --- openerp/addons/base/res/res_users.py | 6 ++---- openerp/service/security.py | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 3b01313dc7c..84c87f0fc29 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -30,6 +30,7 @@ from openerp import pooler, tools import openerp.exceptions from openerp.osv import fields,osv, expression from openerp.osv.orm import browse_record +from openerp.service.security import check_super from openerp.tools.translate import _ _logger = logging.getLogger(__name__) @@ -422,10 +423,7 @@ class res_users(osv.osv): return dataobj.browse(cr, uid, data_id, context=context).res_id def check_super(self, passwd): - if passwd == tools.config['admin_passwd']: - return True - else: - raise openerp.exceptions.AccessDenied() + return check_super(passwd) def check_credentials(self, cr, uid, password): """ Override this method to plug additional authentication methods""" diff --git a/openerp/service/security.py b/openerp/service/security.py index d327efe5443..90ad6d0ebfe 100644 --- a/openerp/service/security.py +++ b/openerp/service/security.py @@ -31,10 +31,9 @@ def login(db, login, password): return user_obj.login(db, login, password) def check_super(passwd): - if passwd == tools.config['admin_passwd']: + if passwd and passwd == tools.config['admin_passwd']: return True - else: - raise openerp.exceptions.AccessDenied() + raise openerp.exceptions.AccessDenied() def check(db, uid, passwd): pool = pooler.get_pool(db)