diff --git a/dojo/decorators.py b/dojo/decorators.py index b7b84d59430..bba9efe234c 100644 --- a/dojo/decorators.py +++ b/dojo/decorators.py @@ -222,7 +222,7 @@ def _wrapped(request, *args, **kw): if username: dojo_user = Dojo_User.objects.filter(username=username).first() if dojo_user: - Dojo_User.enable_force_password_reset(dojo_user) + dojo_user.enable_force_password_reset() raise Ratelimited return fn(request, *args, **kw) return _wrapped diff --git a/dojo/importers/base_importer.py b/dojo/importers/base_importer.py index f6d754ba929..212c976dc33 100644 --- a/dojo/importers/base_importer.py +++ b/dojo/importers/base_importer.py @@ -49,6 +49,7 @@ class Parser: and is purely for the sake of type hinting """ + @staticmethod def get_findings(scan_type: str, test: Test) -> list[Finding]: """ Stub function to make the hinting happier. The actual class diff --git a/dojo/importers/options.py b/dojo/importers/options.py index b83a8b8597c..3b7c624235d 100644 --- a/dojo/importers/options.py +++ b/dojo/importers/options.py @@ -96,6 +96,7 @@ def log_translation( for field in self.field_names: logger.debug(f"{field}: {getattr(self, field)}") + @staticmethod def _compress_decorator(function): @wraps(function) def inner_compress_function(*args, **kwargs): @@ -103,6 +104,7 @@ def inner_compress_function(*args, **kwargs): return function(*args, **kwargs) return inner_compress_function + @staticmethod def _decompress_decorator(function): @wraps(function) def inner_decompress_function(*args, **kwargs): diff --git a/dojo/models.py b/dojo/models.py index 741f630fb92..f7640603465 100644 --- a/dojo/models.py +++ b/dojo/models.py @@ -231,15 +231,15 @@ def wants_block_execution(user): def force_password_reset(user): return hasattr(user, "usercontactinfo") and user.usercontactinfo.force_password_reset - def disable_force_password_reset(user): - if hasattr(user, "usercontactinfo"): - user.usercontactinfo.force_password_reset = False - user.usercontactinfo.save() - - def enable_force_password_reset(user): - if hasattr(user, "usercontactinfo"): - user.usercontactinfo.force_password_reset = True - user.usercontactinfo.save() + def disable_force_password_reset(self): + if hasattr(self, "usercontactinfo"): + self.usercontactinfo.force_password_reset = False + self.usercontactinfo.save() + + def enable_force_password_reset(self): + if hasattr(self, "usercontactinfo"): + self.usercontactinfo.force_password_reset = True + self.usercontactinfo.save() @staticmethod def generate_full_name(user): diff --git a/dojo/user/views.py b/dojo/user/views.py index 603eb2e0db4..f4e2539d659 100644 --- a/dojo/user/views.py +++ b/dojo/user/views.py @@ -287,7 +287,7 @@ def change_password(request): new_password = form.cleaned_data["new_password"] user.set_password(new_password) - Dojo_User.disable_force_password_reset(user) + user.disable_force_password_reset() user.save() messages.add_message(request, diff --git a/ruff.toml b/ruff.toml index 092bd58fee0..1f0cb8d3b83 100644 --- a/ruff.toml +++ b/ruff.toml @@ -74,7 +74,7 @@ select = [ "C90", "NPY", "PD", - "N803", "N804", "N811", "N812", "N813", "N814", "N817", "N818", "N999", + "N803", "N804", "N805", "N811", "N812", "N813", "N814", "N817", "N818", "N999", "PERF1", "PERF2", "PERF401", "PERF403", "E", "W",