fix(geo): skip WHOIS and estimated location on deactivated devices

null

@@ -0,0 +1 @@
+fatal: no rebase in progress

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/service.py

@@ -210,6 +210,8 @@ def process_ip_data_and_location(self, force_lookup=False):
         Trigger WHOIS lookup based on the conditions of `_need_whois_lookup`.
         Tasks are triggered on commit to ensure redundant data is not created.
         """
+        if self.device.is_deactivated():
+            return
         new_ip = self.device.last_ip
         initial_ip = self.device._initial_last_ip
         if force_lookup or self._need_whois_lookup(new_ip):
@@ -229,6 +231,8 @@ def update_whois_info(self):
         when the data is older than
         ``OPENWISP_CONTROLLER_WHOIS_REFRESH_THRESHOLD_DAYS``.
         """
+        if self.device.is_deactivated():
+            return
         ip_address = self.device.last_ip
         if not self.is_valid_public_ip_address(ip_address):
             return

openwisp_controller/config/whois/tests/tests.py

@@ -346,7 +346,7 @@ def test_last_ip_management_command_queries(self):
             name="default.test.device4", mac_address="66:33:44:55:66:77"
         )
         args = ["--noinput"]
-        # 4 queries (3 for each device's last_ip update) and 1 for fetching devices
+
         with self.assertNumQueries(4):
             call_command("clear_last_ip", *args, stdout=out, stderr=StringIO())
 
@@ -1186,3 +1186,70 @@ def _assert_no_js_errors():
                 _assert_no_js_errors()
             except UnexpectedAlertPresentException:
                 self.fail("XSS vulnerability detected in WHOIS details admin view.")
+
+
+class TestWHOISDeactivated(
+    CreateWHOISMixin, WHOISTransactionMixin, TransactionTestCase
+):
+    def setUp(self):
+        super().setUp()
+        self.device = self._create_device()
+        org_settings = self.device.organization.config_settings
+        org_settings.whois_enabled = True
+        org_settings.save()
+
+    @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):
+        # 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()
+
+        self.assertEqual(mock_task.call_count, 0)
+
+    @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.last_ip = "8.8.8.8"
+        self.device.save()
+
+        mock_task.reset_mock()
+
+        service = WHOISService(self.device)
+        service.process_ip_data_and_location()
+
+        # transaction.on_commit executes immediately in TransactionTestCase,
+        # so the task is triggered synchronously here
+        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):
+        ip = "8.8.8.8"
+        self.device.last_ip = ip
+        self.device.save()
+
+        threshold = app_settings.WHOIS_REFRESH_THRESHOLD_DAYS + 1
+        expired_time = timezone.now() - timedelta(days=threshold)
+
+        whois_obj = self._create_whois_info(ip_address=ip)
+        WHOISInfo.objects.filter(pk=whois_obj.pk).update(modified=expired_time)
+
+        self.device.deactivate()
+
+        mock_task.reset_mock()
+
+        service = 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",