From 0482256f2c86b0098bf38ba9d35a4af61f55667e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 10 May 2013 11:38:54 +0200 Subject: [PATCH] [IMP] remove read access to outgoing mail configuration for non-system users bzr revid: mat@openerp.com-20130510093854-7knn68l9dns1nhg1 --- openerp/addons/base/ir/ir_mail_server.py | 7 ++++--- openerp/addons/base/security/ir.model.access.csv | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 0415641..251201f 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -33,6 +33,7 @@ import threading from osv import osv from osv import fields +from openerp import SUPERUSER_ID from openerp.tools.translate import _ from openerp.tools import html2text import openerp.tools as tools @@ -416,11 +417,11 @@ class ir_mail_server(osv.osv): # Get SMTP Server Details from Mail Server mail_server = None if mail_server_id: - mail_server = self.browse(cr, uid, mail_server_id) + mail_server = self.browse(cr, SUPERUSER_ID, mail_server_id) elif not smtp_server: - mail_server_ids = self.search(cr, uid, [], order='sequence', limit=1) + mail_server_ids = self.search(cr, SUPERUSER_ID, [], order='sequence', limit=1) if mail_server_ids: - mail_server = self.browse(cr, uid, mail_server_ids[0]) + mail_server = self.browse(cr, SUPERUSER_ID, mail_server_ids[0]) else: # we were passed an explicit smtp_server or nothing at all smtp_server = smtp_server or tools.config.get('smtp_server') diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index 59ebafb..2455837 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -122,6 +122,6 @@ "access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0 "access_res_log_all","res.log","model_res_log",,1,1,1,1 "access_ir_config_parameter","ir_config_parameter","model_ir_config_parameter",,1,0,0,0 -"access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0 +"access_ir_mail_server","ir_mail_server","model_ir_mail_server","group_system",1,1,1,1 "access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0 -- 1.7.10.4