From 6ad9be7acc709bd21f8331df7cecba8bfe997cef Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 22 May 2018 12:05:43 +0100 Subject: [PATCH] [FIX] auth_brute_force: Fix addon requirement computation (#1251) Include HACK for https://github.com/odoo/odoo/pull/24833, which explains the false positive problem we were having here: an addon being importable doesn't mean it is installed. --- auth_brute_force/__manifest__.py | 2 +- auth_brute_force/tests/test_brute_force.py | 40 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/auth_brute_force/__manifest__.py b/auth_brute_force/__manifest__.py index 9aa33dfae..3ba4dca03 100644 --- a/auth_brute_force/__manifest__.py +++ b/auth_brute_force/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Authentification - Brute-Force Filter', - 'version': '10.0.2.1.0', + 'version': '10.0.2.1.1', 'category': 'Tools', 'summary': "Track Authentication Attempts and Prevent Brute-force Attacks", 'author': "GRAP, " diff --git a/auth_brute_force/tests/test_brute_force.py b/auth_brute_force/tests/test_brute_force.py index d4a3fb712..2e21b534d 100644 --- a/auth_brute_force/tests/test_brute_force.py +++ b/auth_brute_force/tests/test_brute_force.py @@ -3,14 +3,14 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from threading import current_thread -from unittest import skipUnless from urllib import urlencode +from decorator import decorator from mock import patch from werkzeug.utils import redirect from odoo import http -from odoo.tests.common import at_install, can_import, HttpCase, post_install +from odoo.tests.common import at_install, HttpCase, post_install from odoo.tools import mute_logger from ..models import res_authentication_attempt, res_users @@ -23,6 +23,29 @@ GARBAGE_LOGGERS = ( ) +# HACK https://github.com/odoo/odoo/pull/24833 +def skip_unless_addons_installed(*addons): + """Decorator to skip a test unless some addons are installed. + + :param *str addons: + Addon names that should be installed. + + :param reason: + Explain why you must skip this test. + """ + + @decorator + def _wrapper(method, self, *args, **kwargs): + installed = self.addons_installed(*addons) + if not installed: + missing = set(addons) - installed + self.skipTest("Required addons not installed: %s" % + ",".join(sorted(missing))) + return method(self, *args, **kwargs) + + return _wrapper + + @at_install(False) @post_install(True) # Skip CSRF validation on tests @@ -62,7 +85,16 @@ class BruteForceCase(HttpCase): ("login", "=", self.data_demo["login"]), ]).password = self.data_demo["password"] - @skipUnless(can_import("odoo.addons.web"), "Needs web addon") + # HACK https://github.com/odoo/odoo/pull/24833 + def addons_installed(self, *addons): + """Know if the specified addons are installed.""" + found = self.env["ir.module.module"].search([ + ("name", "in", addons), + ("state", "not in", ["uninstalled", "uninstallable"]), + ]) + return set(addons) - set(found.mapped("name")) + + @skip_unless_addons_installed("web") @mute_logger(*GARBAGE_LOGGERS) def test_web_login_existing(self, *args): """Remote is banned with real user on web login form.""" @@ -131,7 +163,7 @@ class BruteForceCase(HttpCase): response = self.url_open("/web/login", bytes(urlencode(data1)), 30) self.assertTrue(response.geturl().endswith("/web")) - @skipUnless(can_import("odoo.addons.web"), "Needs web addon") + @skip_unless_addons_installed("web") @mute_logger(*GARBAGE_LOGGERS) def test_web_login_unexisting(self, *args): """Remote is banned with fake user on web login form."""