Return invalid IP error in network explorer search

johannaengland · johannaengland · commit e5f2160afa74 · 2025-09-18T08:02:22.000+02:00
diff --git a/changelog.d/3534.fixed.md b/changelog.d/3534.fixed.md
@@ -0,0 +1 @@
+Show errors on invalid IP in network explorer search
diff --git a/python/nav/web/networkexplorer/forms.py b/python/nav/web/networkexplorer/forms.py
@@ -1,5 +1,7 @@
 from django import forms
 
+from nav.util import is_valid_ip
+
 
 # TODO: Borrowed from newer radius. Need to be removed
 # TODO: and imported from elsewhere
@@ -81,3 +83,12 @@ class NetworkSearchForm(forms.Form):
     hide_ports = forms.BooleanField(
         label='Hide ports with no description', required=False
     )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if cleaned_data.get("query"):
+            query, query_type = cleaned_data["query"]
+            if query_type == "ip" and cleaned_data["exact_results"]:
+                if not is_valid_ip(query):
+                    self._errors['address'] = self.error_class(["Invalid IP address"])
+        return cleaned_data
diff --git a/python/nav/web/networkexplorer/views.py b/python/nav/web/networkexplorer/views.py
@@ -94,17 +94,19 @@ def render_to_response(self, context):
 
 class SearchView(JSONResponseMixin, View):
     def form_invalid(self, form):
-        return {'error': form.errors}
+        return {'errors': form.errors}
 
     def form_valid(self, form):
         return search(form.cleaned_data)
 
     def get(self, request, *_args, **_kwargs):
         form = NetworkSearchForm(request.GET)
+        status = 200
 
         if form.is_valid():
             context = self.form_valid(form)
         else:
             context = self.form_invalid(form)
+            status = 400
 
-        return self.render_json_response(context)
+        return self.render_json_response(context, status=status)
diff --git a/tests/integration/networkexplorer_test.py b/tests/integration/networkexplorer_test.py
@@ -110,16 +110,47 @@ def test_search_view_with_invalid_query(self):
         response = SearchView.as_view()(request)
         content = response.content.decode('utf-8')
 
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 400)
         self.assertFalse('routers' in content)
         self.assertFalse('gwports' in content)
         self.assertFalse('swports' in content)
 
+    def test_search_view_will_return_status_400_on_invalid_exact_ip_search(self):
+        request = self.factory.get(
+            self.url_root + 'search/',
+            {
+                'query_0': 'invalid',
+                'query_1': 'ip',
+                'exact_results': 'on',
+            },
+        )
+        response = SearchView.as_view()(request)
+        content = response.content.decode('utf-8')
+
+        assert response.status_code == 400
+        assert "Invalid IP address" in content
+
 
 class FormsTest(TestDataMixin, TestCase):
-    def test_search_form(self):
+    def test_search_form_with_valid_data_is_valid(self):
         valid_form = NetworkSearchForm(self.valid_data)
-        invalid_form = NetworkSearchForm(self.invalid_data)
 
         self.assertTrue(valid_form.is_valid(), msg='Valid form failed validaion')
+
+    def test_search_form_with_missing_argument_is_invalid(self):
+        invalid_form = NetworkSearchForm(self.invalid_data)
+
         self.assertFalse(invalid_form.is_valid(), msg='Invalid form passed validation')
+
+    def test_search_form_with_invalid_ip_for_exact_search_is_invalid(self):
+        invalid_ip_form = NetworkSearchForm(
+            {
+                "query_0": "invalid_ip",
+                "query_1": "ip",
+                "exact_results": True,
+            }
+        )
+
+        self.assertFalse(
+            invalid_ip_form.is_valid(), msg="Invalid IP form passed validation"
+        )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Show errors on invalid IP in network explorer search`