Merge lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:~server-env-tools-core-editors/server-env-tools/7.0

[Sylvain LE GAL (GRAP)]

[ADD] Regression Tests;
[FIX] Uncaught error is raised when the admin user tries to connect with a bad login and his password;
[ADD] Test for the fixed bug;

Hi all,

I propose for merging this code to fix the bug https://bugs.launchpad.net/server-env-tools/+bug/1319391.

I added Test files to :
- avoid regressions;
- to give the possibility to the community to test more easily this module with other 'auth_...' module;

Regards.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

LGTM, thanks.

Regards.

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

Thanks for the tests

review: Approve (code review, no test)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Please next time explain what you do in your commit message.

Fix bug XY is not really understandable at a first glance.

To link the bug --fixes=lp:XY is there

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hi,

i can change it because you did'nt merge it.

BTW i put --fixes=lp:xxx too. (Launchpad indicates that correctly).

Regards.

*Sylvain LE GAL*

* Service informatiqueGroupement Régional Alimentaire de Proximité*
3 Grande rue des feuillants 69001 Lyon
*Bureau : *(+33) 09.72.32.33.17
*Astreinte :* (+33) 06.81.85.61.43
*Site Web** : *www.grap.coop
* Twitter : *@legalsylvain* <https://twitter.com/legalsylvain>*

2014-05-16 16:22 GMT+02:00 Yannick Vaucher @ Camptocamp <
<email address hidden>>:

> Please next time explain what you do in your commit message.
>
> Fix bug XY is not really understandable at a first glance.
>
> To link the bug --fixes=lp:XY is there
> --
>
> https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530
> You are the owner of lp:~sylvain-legal/server-env-tools/7.0-fix-1319391.
>

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Already merged

=== modified file 'auth_admin_passkey/model/res_users.py'
--- auth_admin_passkey/model/res_users.py	2014-03-31 14:15:32 +0000
+++ auth_admin_passkey/model/res_users.py	2014-05-14 13:37:38 +0000
@@ -96,7 +96,7 @@
  is admin password. In the second case, send mail to user and admin."""
         user_id = super(res_users, self).authenticate(
             db, login, password, user_agent_env)
-        if user_id != SUPERUSER_ID:
+        if user_id and (user_id != SUPERUSER_ID):
             same_password = False
             cr = pooler.get_db(db).cursor()
             try:

=== added directory 'auth_admin_passkey/tests'
=== added file 'auth_admin_passkey/tests/__init__.py'
--- auth_admin_passkey/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ auth_admin_passkey/tests/__init__.py	2014-05-14 13:37:38 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Admin Passkey module for OpenERP
+#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
+#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_auth_admin_passkey

=== added file 'auth_admin_passkey/tests/test_auth_admin_passkey.py'
--- auth_admin_passkey/tests/test_auth_admin_passkey.py	1970-01-01 00:00:00 +0000
+++ auth_admin_passkey/tests/test_auth_admin_passkey.py	2014-05-14 13:37:38 +0000
@@ -0,0 +1,99 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Admin Passkey module for OpenERP
+#    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
+#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+
+from openerp.tests.common import TransactionCase
+
+
+class TestAuthAdminPasskey(TransactionCase):
+    """Tests for 'Auth Admin Passkey' Module"""
+
+    # Overload Section
+    def setUp(self):
+        super(TestAuthAdminPasskey, self).setUp()
+
+        # Get Registries
+        self.imd_obj = self.registry('ir.model.data')
+        self.ru_obj = self.registry('res.users')
+
+        # Get Database name
+        self.db = threading.current_thread().dbname
+
+        # Get ids from xml_ids
+        self.admin_user_id = self.imd_obj.get_object_reference(
+            self.cr, self.uid, 'base', 'user_root')[1]
+        self.demo_user_id = self.imd_obj.get_object_reference(
+            self.cr, self.uid, 'base', 'user_demo')[1]
+
+    # Test Section
+    def test_01_normal_login_admin_succeed(self):
+        """[Regression Test]
+        Test the succeed of login with 'admin' / 'admin'"""
+        res = self.ru_obj.authenticate(self.db, 'admin', 'admin', {})
+        self.assertEqual(
+            res, self.admin_user_id,
+            "'admin' / 'admin' login must succeed.")
+
+    def test_02_normal_login_admin_fail(self):
+        """[Regression Test]
+        Test the fail of login with 'admin' / 'bad_password'"""
+        res = self.ru_obj.authenticate(self.db, 'admin', 'bad_password', {})
+        self.assertEqual(
+            res, False,
+            "'admin' / 'bad_password' login must fail.")
+
+    def test_03_normal_login_demo_succeed(self):
+        """[Regression Test]
+        Test the succeed of login with 'demo' / 'demo'"""
+        res = self.ru_obj.authenticate(self.db, 'demo', 'demo', {})
+        self.assertEqual(
+            res, self.demo_user_id,
+            "'demo' / 'demo' login must succeed.")
+
+    def test_04_normal_login_demo_fail(self):
+        """[Regression Test]
+        Test the fail of login with 'demo' / 'bad_password'"""
+        res = self.ru_obj.authenticate(self.db, 'demo', 'bad_password', {})
+        self.assertEqual(
+            res, False,
+            "'demo' / 'bad_password' login must fail.")
+
+    def test_05_passkey_login_demo_succeed(self):
+        """[New Feature]
+        Test the succeed of login with 'demo' / 'admin'"""
+        res = self.ru_obj.authenticate(self.db, 'demo', 'admin', {})
+        self.assertEqual(
+            res, self.demo_user_id,
+            "'demo' / 'admin' login must succeed.")
+
+    def test_06_passkey_login_demo_succeed(self):
+        """[Bug #1319391]
+        Test the correct behaviour of login with 'bad_login' / 'admin'"""
+        exception_raised = False
+        try:
+            res = self.ru_obj.authenticate(self.db, 'bad_login', 'admin', {})
+        except:
+            exception_raised = True
+        self.assertEqual(
+            exception_raised, False,
+            "'bad_login' / 'admin' musn't raise Error.")