[fix] Skip WHOIS and estimated location for deactivated devices #1325

- add guard in WHOISService to skip processing for deactivated devices
- add guard in EstimatedLocationService to prevent task scheduling
- fix N+1 query by including _is_deactivated in clear_last_ip_command
  queryset
- add regression tests ensuring tasks are skipped when device is
  deactivated
- ensure deterministic tests by enabling whois on organization
  settings

Fixes #1325

Author: tomsebastian10

openwisp_controller/config/whois/commands.py

@@ -39,7 +39,7 @@ def clear_last_ip_command(stdout, stderr, interactive=True):
         )
         # include the FK field 'organization' in .only() so the related
         # `organization__config_settings` traversal is not deferred
-        .only("last_ip", "organization", "key")
+        .only("last_ip", "organization", "key", "_is_deactivated")
     )
     # Filter out devices that have WHOIS information for their last IP
     devices = devices.exclude(last_ip=None).exclude(

openwisp_controller/config/whois/tests/tests.py

@@ -21,9 +21,7 @@
 from selenium.webdriver.common.by import By
 from swapper import load_model
 
-from openwisp_controller.config import settings as app_settings
 from openwisp_controller.config.signals import whois_fetched, whois_lookup_skipped
-from openwisp_controller.config.whois.service import WHOISService
 from openwisp_utils.tests import SeleniumTestMixin, catch_signal
 
 from ....tests.utils import TestAdminMixin
@@ -349,7 +347,7 @@ def test_last_ip_management_command_queries(self):
         )
         args = ["--noinput"]
 
-        with self.assertNumQueries(7):
+        with self.assertNumQueries(4):
             call_command("clear_last_ip", *args, stdout=out, stderr=StringIO())
 
     @mock.patch.object(app_settings, "WHOIS_CONFIGURED", True)
@@ -1203,7 +1201,13 @@ def setUp(self):
     @mock.patch.object(app_settings, "WHOIS_CONFIGURED", True)
     @mock.patch("openwisp_controller.config.whois.service.fetch_whois_details.delay")
     def test_process_ip_skips_when_deactivated(self, mock_task):
-        self.device._is_deactivated = True
+        # Public IP that would normally trigger a lookup, so the only reason
+        # the task is not enqueued is the deactivation guard under test.
+        self.device.last_ip = "8.8.8.8"
+        self.device.save()
+        mock_task.reset_mock()
+
+        self.device.deactivate()
 
         service = WHOISService(self.device)
         service.process_ip_data_and_location()
@@ -1213,10 +1217,29 @@ def test_process_ip_skips_when_deactivated(self, mock_task):
     @mock.patch.object(app_settings, "WHOIS_CONFIGURED", True)
     @mock.patch("openwisp_controller.config.whois.service.fetch_whois_details.delay")
     def test_process_ip_runs_when_active(self, mock_task):
-        self.device._is_deactivated = False
         self.device.last_ip = "8.8.8.8"
+        self.device.save()
+
+        mock_task.reset_mock()
 
         service = WHOISService(self.device)
         service.process_ip_data_and_location()
 
-        self.assertEqual(mock_task.call_count, 1)
+        mock_task.assert_called_once_with(
+            device_pk=self.device.pk,
+            initial_ip_address=self.device._initial_last_ip,
+        )
+
+    @mock.patch.object(app_settings, "WHOIS_CONFIGURED", True)
+    @mock.patch("openwisp_controller.config.whois.service.fetch_whois_details.delay")
+    def test_update_whois_skips_when_deactivated(self, mock_task):
+        self.device.last_ip = "8.8.8.8"
+        self.device.save()
+        mock_task.reset_mock()
+
+        self.device.deactivate()
+
+        ervice = WHOISService(self.device)
+        service.update_whois_info()
+
+        mock_task.assert_not_called()

openwisp_controller/geo/estimated_location/service.py

@@ -63,6 +63,8 @@ def is_estimated_location_enabled(self):
         return self.check_estimated_location_enabled(self.device.organization_id)
 
     def trigger_estimated_location_task(self, ip_address):
+        if self.device.is_deactivated():
+            return
         try:
             current_app.send_task(
                 "whois_estimated_location_task",