diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index d96b2b24b..6f8fa2279 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -16,6 +16,7 @@ * [#4326](https://github.com/netbox-community/netbox/issues/4326) - Exclude Python modules without Script classes from scripts list * [#4337](https://github.com/netbox-community/netbox/issues/4337) - Allow bulk editing/deletion of all device components matching a query +* [#4338](https://github.com/netbox-community/netbox/issues/4338) - Catch `AddrFormatError` exception when filtering aggregates/prefixes by an invalid prefix --- diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py index c2dbd573b..ed77ee014 100644 --- a/netbox/ipam/filters.py +++ b/netbox/ipam/filters.py @@ -111,7 +111,7 @@ class AggregateFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt try: query = str(netaddr.IPNetwork(value).cidr) return queryset.filter(prefix=query) - except ValidationError: + except (AddrFormatError, ValueError): return queryset.none() @@ -233,7 +233,7 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre try: query = str(netaddr.IPNetwork(value).cidr) return queryset.filter(prefix=query) - except ValidationError: + except (AddrFormatError, ValueError): return queryset.none() def search_within(self, queryset, name, value):