9.0 auth admin passkey #522
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,6 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright (C) 2013-2014 GRAP (http://www.grap.coop) | ||
| # @author Sylvain LE GAL (https://twitter.com/legalsylvain) | ||
| # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
|
|
||
| from . import model | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,53 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright (C) 2013-2014 GRAP (http://www.grap.coop) | ||
| # @author Sylvain LE GAL (https://twitter.com/legalsylvain) | ||
| # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
|
|
||
| from openerp import api, fields, models | ||
|
|
||
|
|
||
| class BaseConfigSettings(models.TransientModel): | ||
| _inherit = 'base.config.settings' | ||
|
|
||
| # Getter / Setter Section | ||
| @api.model | ||
| def get_default_auth_admin_passkey_send_to_admin(self, fields): | ||
| return { | ||
| 'auth_admin_passkey_send_to_admin': | ||
| self.env["ir.config_parameter"].get_param( | ||
| "auth_admin_passkey.send_to_admin") | ||
| } | ||
|
|
||
| @api.multi | ||
| def set_auth_admin_passkey_send_to_admin(self): | ||
| for config in self: | ||
| self.env['ir.config_parameter'].set_param( | ||
| "auth_admin_passkey.send_to_admin", | ||
| config.auth_admin_passkey_send_to_admin or '') | ||
|
|
||
| @api.model | ||
| def get_default_auth_admin_passkey_send_to_user(self, fields): | ||
| return { | ||
| 'auth_admin_passkey_send_to_user': | ||
| self.env["ir.config_parameter"].get_param( | ||
| "auth_admin_passkey.send_to_user") | ||
| } | ||
|
|
||
| @api.multi | ||
| def set_auth_admin_passkey_send_to_user(self): | ||
| for config in self: | ||
| self.env['ir.config_parameter'].set_param( | ||
| "auth_admin_passkey.send_to_user", | ||
| config.auth_admin_passkey_send_to_user or '') | ||
|
|
||
| auth_admin_passkey_send_to_admin = fields.Boolean( | ||
|
There was a problem hiding this comment. Please move column definitions above the methods |
||
| string='Send email to admin user.', | ||
| help="""When the administrator use his password to login in """ | ||
| """with a different account, OpenERP will send an email """ | ||
| """to the admin user.""") | ||
|
|
||
| auth_admin_passkey_send_to_user = fields.Boolean( | ||
| string='Send email to user.', | ||
| help="""When the administrator use his password to login in """ | ||
| """with a different account, OpenERP will send an email """ | ||
| """to the account user.""") | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,40 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright (C) 2013-2014 GRAP (http://www.grap.coop) | ||
| # @author Sylvain LE GAL (https://twitter.com/legalsylvain) | ||
| # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
|
|
||
| import datetime | ||
|
|
||
| from openerp import SUPERUSER_ID | ||
| from openerp import registry | ||
| from openerp import exceptions | ||
| from openerp import models, api | ||
|
There was a problem hiding this comment. IMO it is inconsistent to perform all the other There was a problem hiding this comment. hi @lasley I think it is OK for this one cause models/api always are on the same line but other can be accepted into multiple line instruction. I am ok to let it as it is. what do you think about it? |
||
| from openerp.tools.translate import _ | ||
| from openerp.tools.safe_eval import safe_eval | ||
|
|
||
|
|
||
| class ResUsers(models.Model): | ||
| _inherit = "res.users" | ||
|
|
||
| def _get_translation(self, lang, text): | ||
| context = {'lang': lang} # noqa: _() checks page for locals | ||
| return _(text) | ||
|
|
||
| @api.model | ||
| def _send_email_passkey(self, user_agent_env): | ||
| """ Send a email to the admin of the system and / or the user | ||
| to inform passkey use.""" | ||
| mails = [] | ||
| mail_obj = self.env['mail.mail'] | ||
| icp_obj = self.env['ir.config_parameter'] | ||
| admin_user = self.sudo().browse(SUPERUSER_ID) | ||
|
There was a problem hiding this comment. Wouldn't |
||
| login_user = self.sudo().browse(self.env.uid) | ||
|
There was a problem hiding this comment. Why not There was a problem hiding this comment. @lasley I think that |
||
| send_to_admin = safe_eval(icp_obj.sudo().get_param( | ||
| 'auth_admin_passkey.send_to_admin', | ||
| 'True')) | ||
| send_to_user = safe_eval(icp_obj.sudo().get_param( | ||
| 'auth_admin_passkey.send_to_user', | ||
| 'True')) | ||
|
|
||
| if send_to_admin and admin_user.email: | ||
| mails.append({'email': admin_user.email, 'lang': admin_user.lang}) | ||
|
|
@@ -58,34 +43,34 @@ def _send_email_passkey(self, cr, user_id, user_agent_env): | |
|
|
||
| for mail in mails: | ||
| subject = self._get_translation( | ||
| mail['lang'], _('Passkey used')) | ||
| body = self._get_translation( | ||
| mail['lang'], | ||
| _("""Admin user used his passkey to login with '%s'.\n\n""" | ||
| """\n\nTechnicals informations belows : \n\n""" | ||
| """- Login date : %s\n\n""")) % ( | ||
| login_user.login, | ||
| datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) | ||
|
|
||
| for k, v in user_agent_env.iteritems(): | ||
| body += ("- %s : %s\n\n") % (k, v) | ||
| mail_obj.sudo().create({ | ||
| 'email_to': mail['email'], | ||
| 'subject': subject, | ||
| 'body_html': '<pre>%s</pre>' % body}) | ||
|
|
||
| @api.cr | ||
| def _send_email_same_password(self, login_user): | ||
| """ Send a email to the admin user to inform that another user has the | ||
| same password as him.""" | ||
| mail_obj = self.env['mail.mail'] | ||
| admin_user = self.sudo().browse(SUPERUSER_ID) | ||
|
|
||
| if admin_user.email: | ||
| mail_obj.sudo().create({ | ||
| 'email_to': admin_user.email, | ||
| 'subject': self._get_translation( | ||
| admin_user.lang, _('[WARNING] OpenERP Security Risk')), | ||
| 'body_html': self._get_translation( | ||
| admin_user.lang, _( | ||
| """<pre>User with login '%s' has the same """ | ||
| """password as you.</pre>""")) % (login_user), | ||
| }) | ||
|
|
@@ -94,20 +79,20 @@ def _send_email_same_password(self, cr, login_user): | |
| def authenticate(self, db, login, password, user_agent_env): | ||
| """ Authenticate the user 'login' is password is ok or if | ||
| is admin password. In the second case, send mail to user and admin.""" | ||
| user_id = super(ResUsers, self).authenticate( | ||
| db, login, password, user_agent_env) | ||
| if user_id and (user_id != SUPERUSER_ID): | ||
| same_password = False | ||
| cr = registry(db).cursor() | ||
|
There was a problem hiding this comment. I think There was a problem hiding this comment. This way to return the cursor is possible into 9.0 source code as Odoo do it into its mail addons 😄 |
||
| try: | ||
| # directly use parent 'check_credentials' function | ||
| # to really know if credentials are ok | ||
| # or if it was admin password | ||
| super(ResUsers, self).check_credentials( | ||
| cr, SUPERUSER_ID, password) | ||
| try: | ||
| # Test now if the user has the same password as admin user | ||
| super(ResUsers, self).check_credentials( | ||
| cr, user_id, password) | ||
| same_password = True | ||
| except exceptions.AccessDenied: | ||
|
|
@@ -116,22 +101,24 @@ def authenticate(self, db, login, password, user_agent_env): | |
| self._send_email_passkey(cr, user_id, user_agent_env) | ||
| else: | ||
| self._send_email_same_password(cr, login) | ||
| # we need to commit as we need to create the mails | ||
| # and we are not in a method with standard cursor management | ||
| cr.commit() # pylint: disable=invalid-commit | ||
| except exceptions.AccessDenied: | ||
| pass | ||
| finally: | ||
| cr.close() | ||
| return user_id | ||
|
|
||
| @api.model | ||
| def check_credentials(self, password): | ||
| """ Return now True if credentials are good OR if password is admin | ||
| password.""" | ||
| if self.env.uid != SUPERUSER_ID: | ||
| try: | ||
| super(ResUsers, self).check_credentials(password) | ||
| return True | ||
| except exceptions.AccessDenied: | ||
| return self.sudo().check_credentials(password) | ||
| else: | ||
| return super(ResUsers, self).check_credentials(password) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May be Add Copyright section for Akretion!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well I'll push a new feature after this API refactor and v9 migration and then I'll mention myself as a contributor indeed.