[fixes] Remove whois related ips from device checksum view

Signed-off-by: DragnEmperor <[email protected]>

Author: DragnEmperor

openwisp_controller/config/base/device.py

@@ -511,7 +511,10 @@ def whois_service(self):
         return WHOISService(self)
 
     def _check_last_ip(self, creating=False):
-        """Trigger WHOIS lookup if last_ip is not deferred."""
+        """
+        Process details and location related to last_ip if last_ip has
+        changed or is being set for the first time.
+        """
         if self._initial_last_ip == models.DEFERRED:
             return
         if creating or self.last_ip != self._initial_last_ip:

openwisp_controller/config/base/whois.py

@@ -115,7 +115,7 @@ def device_whois_info_delete_handler(instance, **kwargs):
             and instance._get_organization__config_settings().whois_enabled
             and not existing_devices.exists()
         ):
-            transaction.on_commit(lambda: delete_whois_record.delay(instance.last_ip))
+            transaction.on_commit(lambda: delete_whois_record.delay(last_ip))
 
     # this method is kept here instead of in OrganizationConfigSettings because
     # currently the caching is used only for WHOIS feature
@@ -155,8 +155,8 @@ def _location_name(self):
         if address:
             parts = [part.strip() for part in address.split(",")[:2] if part.strip()]
             location = ", ".join(parts)
-            return f"{location} (Estimated Location: {self.ip_address})"
-        return f"Estimated Location: {self.ip_address}"
+            return _(f"{location} (Estimated Location: {self.ip_address})")
+        return _(f"Estimated Location: {self.ip_address}")
 
     def _get_defaults_for_estimated_location(self):
         """

openwisp_controller/config/controller/views.py

@@ -153,12 +153,6 @@ def get(self, request, pk):
         # updates cache if ip addresses changed
         if updated:
             self.update_device_cache(device)
-        # When update fields are present then save() will run the WHOIS
-        # lookup. But if there are no update fields, we still want to
-        # trigger the WHOIS lookup which checks if WHOIS lookup is required
-        # or not
-        elif app_settings.WHOIS_CONFIGURED:
-            device.whois_service.process_ip_data_and_location()
         checksum_requested.send(
             sender=device.__class__, instance=device, request=request
         )

openwisp_controller/config/management/commands/clear_last_ip.py

@@ -2,8 +2,6 @@
 from django.db.models import OuterRef, Subquery
 from swapper import load_model
 
-from openwisp_controller.config import settings as app_settings
-
 
 class Command(BaseCommand):
     help = "Clear the last IP address, if set, of active devices of all organizations."
@@ -19,10 +17,6 @@ def add_arguments(self, parser):
         return super().add_arguments(parser)
 
     def handle(self, *args, **options):
-        if not app_settings.WHOIS_CONFIGURED:
-            self.stdout.write("WHOIS must be configured to use this option.")
-            return
-
         Device = load_model("config", "Device")
         WHOISInfo = load_model("config", "WHOISInfo")
 

openwisp_controller/config/whois/test_whois.py

@@ -267,7 +267,6 @@ def test_whois_details_device_api(self):
                 self.assertEqual(response.status_code, 200)
                 self.assertNotIn("whois_info", response.data)
 
-    @mock.patch.object(app_settings, "WHOIS_CONFIGURED", True)
     def test_last_ip_management_command(self):
         out = StringIO()
         device = self._create_device(last_ip="172.217.22.11")
@@ -430,6 +429,7 @@ def test_whois_multiple_orgs(self, mocked_task):
                 {"key": device1.key},
                 REMOTE_ADDR="172.217.22.20",
             )
+            device1.refresh_from_db()
             self.assertEqual(response.status_code, 200)
             mocked_task.assert_called()
             mocked_task.reset_mock()
@@ -438,12 +438,13 @@ def test_whois_multiple_orgs(self, mocked_task):
                 {"key": device2.key},
                 REMOTE_ADDR="172.217.22.30",
             )
+            device2.refresh_from_db()
             self.assertEqual(response.status_code, 200)
             mocked_task.assert_not_called()
             mocked_task.reset_mock()
 
         with self.subTest(
-            "task called via DeviceChecksumView when a device has no WHOIS record"
+            "Task not called via DeviceChecksumView when a device has no WHOIS record"
         ):
             WHOISInfo.objects.all().delete()
             response = self.client.get(
@@ -452,7 +453,7 @@ def test_whois_multiple_orgs(self, mocked_task):
                 REMOTE_ADDR=device1.last_ip,
             )
             self.assertEqual(response.status_code, 200)
-            mocked_task.assert_called()
+            mocked_task.assert_not_called()
             mocked_task.reset_mock()
             response = self.client.get(
                 reverse("controller:device_checksum", args=[device2.pk]),

openwisp_controller/config/whois/tests_utils.py

@@ -108,6 +108,7 @@ def _task_called(self, mocked_task, task_name="WHOIS lookup"):
             # Invalidates old org config settings cache
             org.config_settings.save(update_fields=["whois_enabled"])
             # config is required for checksum view to work
+            device.refresh_from_db()
             self._create_config(device=device)
             # setting remote address field to a public IP to trigger WHOIS task
             # since the view uses this header for tracking the device's IP
@@ -124,19 +125,21 @@ def _task_called(self, mocked_task, task_name="WHOIS lookup"):
             f"{task_name} task called via DeviceChecksumView for no WHOIS record"
         ):
             WHOISInfo.objects.all().delete()
+            device.refresh_from_db()
             response = self.client.get(
                 reverse("controller:device_checksum", args=[device.pk]),
                 {"key": device.key},
                 REMOTE_ADDR=device.last_ip,
             )
             self.assertEqual(response.status_code, 200)
-            mocked_task.assert_called()
+            mocked_task.assert_not_called()
         mocked_task.reset_mock()
 
         with self.subTest(
             f"{task_name} task not called via DeviceChecksumView when WHOIS is disabled"
         ):
             WHOISInfo.objects.all().delete()
+            device.refresh_from_db()
             org.config_settings.whois_enabled = False
             org.config_settings.save(update_fields=["whois_enabled"])
             response = self.client.get(

openwisp_controller/geo/estimated_location/test_estimated_location.py

@@ -153,7 +153,7 @@ def test_estimated_location_task_called(
 
         with self.subTest(
             "Estimated location task not called via DeviceChecksumView when "
-            "last_ip has related WhoIsInfo"
+            "last_ip has no related WhoIsInfo"
         ):
             WHOISInfo.objects.all().delete()
             self._create_whois_info(ip_address=device.last_ip)
@@ -164,7 +164,7 @@ def test_estimated_location_task_called(
                 REMOTE_ADDR=device.last_ip,
             )
             self.assertEqual(response.status_code, 200)
-            mocked_estimated_location_task.assert_called()
+            mocked_estimated_location_task.assert_not_called()
         mocked_estimated_location_task.reset_mock()
 
     @mock.patch.object(config_app_settings, "WHOIS_CONFIGURED", True)