diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py
index 72f03e98a..bebcecb09 100644
--- a/netbox/tenancy/filtersets.py
+++ b/netbox/tenancy/filtersets.py
@@ -90,6 +90,19 @@ class ContactAssignmentFilterSet(NetBoxModelFilterSet):
queryset=Contact.objects.all(),
label=_('Contact (ID)'),
)
+ group_id = TreeNodeMultipleChoiceFilter(
+ queryset=ContactGroup.objects.all(),
+ field_name='contact__group',
+ lookup_expr='in',
+ label=_('Contact group (ID)'),
+ )
+ group = TreeNodeMultipleChoiceFilter(
+ queryset=ContactGroup.objects.all(),
+ field_name='contact__group',
+ lookup_expr='in',
+ to_field_name='slug',
+ label=_('Contact group (slug)'),
+ )
role_id = django_filters.ModelMultipleChoiceFilter(
queryset=ContactRole.objects.all(),
label=_('Contact role (ID)'),
diff --git a/netbox/tenancy/tests/test_filtersets.py b/netbox/tenancy/tests/test_filtersets.py
index e427c90ce..d7337396e 100644
--- a/netbox/tenancy/tests/test_filtersets.py
+++ b/netbox/tenancy/tests/test_filtersets.py
@@ -1,5 +1,7 @@
+from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
+from dcim.models import Manufacturer, Site
from tenancy.filtersets import *
from tenancy.models import *
from utilities.testing import ChangeLoggedFilterSetTests
@@ -192,3 +194,72 @@ class ContactTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'group': [group[0].slug, group[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+
+class ContactAssignmentTestCase(TestCase, ChangeLoggedFilterSetTests):
+ queryset = ContactAssignment.objects.all()
+ filterset = ContactAssignmentFilterSet
+
+ @classmethod
+ def setUpTestData(cls):
+
+ manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
+ sites = (
+ Site(name='Site 1', slug='site-1'),
+ Site(name='Site 2', slug='site-2'),
+ Site(name='Site 3', slug='site-3'),
+ )
+ Site.objects.bulk_create(sites)
+
+ contact_groups = (
+ ContactGroup(name='Contact Group 1', slug='contact-group-1'),
+ ContactGroup(name='Contact Group 2', slug='contact-group-2'),
+ ContactGroup(name='Contact Group 3', slug='contact-group-3'),
+ )
+ for contactgroup in contact_groups:
+ contactgroup.save()
+
+ contact_roles = (
+ ContactRole(name='Contact Role 1', slug='contact-role-1'),
+ ContactRole(name='Contact Role 2', slug='contact-role-2'),
+ ContactRole(name='Contact Role 3', slug='contact-role-3'),
+ )
+ ContactRole.objects.bulk_create(contact_roles)
+
+ contacts = (
+ Contact(name='Contact 1', group=contact_groups[0]),
+ Contact(name='Contact 2', group=contact_groups[1]),
+ Contact(name='Contact 3', group=contact_groups[2]),
+ )
+ Contact.objects.bulk_create(contacts)
+
+ assignments = (
+ ContactAssignment(object=sites[0], contact=contacts[0], role=contact_roles[0]),
+ ContactAssignment(object=sites[1], contact=contacts[1], role=contact_roles[1]),
+ ContactAssignment(object=sites[2], contact=contacts[2], role=contact_roles[2]),
+ ContactAssignment(object=manufacturer, contact=contacts[2], role=contact_roles[2]),
+ )
+ ContactAssignment.objects.bulk_create(assignments)
+
+ def test_content_type(self):
+ params = {'content_type_id': ContentType.objects.get_by_natural_key('dcim', 'site')}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
+ def test_contact(self):
+ contacts = Contact.objects.all()[:2]
+ params = {'contact_id': [contacts[0].pk, contacts[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_group(self):
+ group = ContactGroup.objects.all()[:2]
+ params = {'group_id': [group[0].pk, group[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ params = {'group': [group[0].slug, group[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+ def test_role(self):
+ role = ContactRole.objects.all()[:2]
+ params = {'role_id': [role[0].pk, role[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ params = {'role': [role[0].slug, role[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
diff --git a/netbox/users/models.py b/netbox/users/models.py
index d77d4932c..52ce55e6c 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -220,6 +220,7 @@ class UserConfig(models.Model):
@receiver(post_save, sender=User)
+@receiver(post_save, sender=NetBoxUser)
def create_userconfig(instance, created, raw=False, **kwargs):
"""
Automatically create a new UserConfig when a new User is created. Skip this if importing a user from a fixture.
diff --git a/netbox/utilities/counters.py b/netbox/utilities/counters.py
index 0ee2606db..589dacbdb 100644
--- a/netbox/utilities/counters.py
+++ b/netbox/utilities/counters.py
@@ -1,6 +1,6 @@
from django.apps import apps
from django.db.models import F, Count, OuterRef, Subquery
-from django.db.models.signals import post_delete, post_save
+from django.db.models.signals import post_delete, post_save, pre_delete
from netbox.registry import registry
from .fields import CounterCacheField
@@ -62,6 +62,12 @@ def post_save_receiver(sender, instance, created, **kwargs):
update_counter(parent_model, new_pk, counter_name, 1)
+def pre_delete_receiver(sender, instance, origin, **kwargs):
+ model = instance._meta.model
+ if not model.objects.filter(pk=instance.pk).exists():
+ instance._previously_removed = True
+
+
def post_delete_receiver(sender, instance, origin, **kwargs):
"""
Update counter fields on related objects when a TrackingModelMixin subclass is deleted.
@@ -71,10 +77,8 @@ def post_delete_receiver(sender, instance, origin, **kwargs):
parent_pk = getattr(instance, field_name, None)
# Decrement the parent's counter by one
- if parent_pk is not None:
- # MPTT sends two delete signals for child elements so guard against multiple decrements
- if not origin or origin == instance:
- update_counter(parent_model, parent_pk, counter_name, -1)
+ if parent_pk is not None and not hasattr(instance, "_previously_removed"):
+ update_counter(parent_model, parent_pk, counter_name, -1)
#
@@ -106,6 +110,12 @@ def connect_counters(*models):
weak=False,
dispatch_uid=f'{model._meta.label}.{field.name}'
)
+ pre_delete.connect(
+ pre_delete_receiver,
+ sender=to_model,
+ weak=False,
+ dispatch_uid=f'{model._meta.label}.{field.name}'
+ )
post_delete.connect(
post_delete_receiver,
sender=to_model,
diff --git a/netbox/utilities/forms/widgets/misc.py b/netbox/utilities/forms/widgets/misc.py
index 307031bd8..158b0e67e 100644
--- a/netbox/utilities/forms/widgets/misc.py
+++ b/netbox/utilities/forms/widgets/misc.py
@@ -65,5 +65,5 @@ class ChoicesWidget(forms.Textarea):
if not value:
return None
if type(value) is list:
- return '\n'.join([f'{k},{v}' for k, v in value])
+ return '\n'.join([f'{k}:{v}' for k, v in value])
return value
diff --git a/netbox/utilities/request.py b/netbox/utilities/request.py
index 0f8ee9cae..a5ca145e9 100644
--- a/netbox/utilities/request.py
+++ b/netbox/utilities/request.py
@@ -1,4 +1,5 @@
-from netaddr import IPAddress
+from netaddr import AddrFormatError, IPAddress
+from urllib.parse import urlparse
__all__ = (
'get_client_ip',
@@ -17,11 +18,18 @@ def get_client_ip(request, additional_headers=()):
)
for header in HTTP_HEADERS:
if header in request.META:
- client_ip = request.META[header].split(',')[0].partition(':')[0]
+ ip = request.META[header].split(',')[0].strip()
try:
- return IPAddress(client_ip)
- except ValueError:
- raise ValueError(f"Invalid IP address set for {header}: {client_ip}")
+ return IPAddress(ip)
+ except AddrFormatError:
+ # Parse the string with urlparse() to remove port number or any other cruft
+ ip = urlparse(f'//{ip}').hostname
+
+ try:
+ return IPAddress(ip)
+ except AddrFormatError:
+ # We did our best
+ raise ValueError(f"Invalid IP address set for {header}: {ip}")
# Could not determine the client IP address from request headers
return None
diff --git a/netbox/utilities/templates/builtins/copy_content.html b/netbox/utilities/templates/builtins/copy_content.html
index 9025a71a1..4d9ad9431 100644
--- a/netbox/utilities/templates/builtins/copy_content.html
+++ b/netbox/utilities/templates/builtins/copy_content.html
@@ -1,3 +1,3 @@
-
+
diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py
index 68541ae5a..dc5d75f48 100644
--- a/netbox/utilities/templatetags/builtins/tags.py
+++ b/netbox/utilities/templatetags/builtins/tags.py
@@ -87,13 +87,14 @@ def checkmark(value, show_false=True, true='Yes', false='No'):
@register.inclusion_tag('builtins/copy_content.html')
-def copy_content(target, prefix=None, color='primary'):
+def copy_content(target, prefix=None, color='primary', classes=None):
"""
Display a copy button to copy the content of a field.
"""
return {
'target': f'#{prefix or ""}{target}',
- 'color': f'btn-{color}'
+ 'color': f'btn-{color}',
+ 'classes': classes or '',
}
diff --git a/netbox/utilities/tests/test_request.py b/netbox/utilities/tests/test_request.py
new file mode 100644
index 000000000..69f677323
--- /dev/null
+++ b/netbox/utilities/tests/test_request.py
@@ -0,0 +1,28 @@
+from django.test import TestCase, RequestFactory
+
+from netaddr import IPAddress
+from utilities.request import get_client_ip
+
+
+class GetClientIPTests(TestCase):
+ def setUp(self):
+ self.factory = RequestFactory()
+
+ def test_ipv4_address(self):
+ request = self.factory.get('/', HTTP_X_FORWARDED_FOR='192.168.1.1')
+ self.assertEqual(get_client_ip(request), IPAddress('192.168.1.1'))
+ request = self.factory.get('/', HTTP_X_FORWARDED_FOR='192.168.1.1:8080')
+ self.assertEqual(get_client_ip(request), IPAddress('192.168.1.1'))
+
+ def test_ipv6_address(self):
+ request = self.factory.get('/', HTTP_X_FORWARDED_FOR='2001:db8::8a2e:370:7334')
+ self.assertEqual(get_client_ip(request), IPAddress('2001:db8::8a2e:370:7334'))
+ request = self.factory.get('/', HTTP_X_FORWARDED_FOR='[2001:db8::8a2e:370:7334]')
+ self.assertEqual(get_client_ip(request), IPAddress('2001:db8::8a2e:370:7334'))
+ request = self.factory.get('/', HTTP_X_FORWARDED_FOR='[2001:db8::8a2e:370:7334]:8080')
+ self.assertEqual(get_client_ip(request), IPAddress('2001:db8::8a2e:370:7334'))
+
+ def test_invalid_ip_address(self):
+ request = self.factory.get('/', HTTP_X_FORWARDED_FOR='invalid_ip')
+ with self.assertRaises(ValueError):
+ get_client_ip(request)
diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py
index ba0c4cc6d..5b0d097f8 100644
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -46,6 +46,7 @@ class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi
(_('Tenant'), ('tenant_group_id', 'tenant_id')),
(_('Contacts'), ('contact', 'contact_role', 'contact_group')),
)
+ selector_fields = ('filter_id', 'q', 'group_id')
type_id = DynamicModelMultipleChoiceField(
queryset=ClusterType.objects.all(),
required=False,
@@ -188,6 +189,7 @@ class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
(_('Virtual Machine'), ('cluster_id', 'virtual_machine_id')),
(_('Attributes'), ('enabled', 'mac_address', 'vrf_id', 'l2vpn_id')),
)
+ selector_fields = ('filter_id', 'q', 'virtual_machine_id')
cluster_id = DynamicModelMultipleChoiceField(
queryset=Cluster.objects.all(),
required=False,
diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py
index 5b71c24aa..3068bfac2 100644
--- a/netbox/vpn/forms/model_forms.py
+++ b/netbox/vpn/forms/model_forms.py
@@ -441,7 +441,7 @@ class L2VPNTerminationForm(NetBoxModelForm):
class Meta:
model = L2VPNTermination
- fields = ('l2vpn', )
+ fields = ('l2vpn', 'tags')
def __init__(self, *args, **kwargs):
instance = kwargs.get('instance')
diff --git a/netbox/vpn/tables/l2vpn.py b/netbox/vpn/tables/l2vpn.py
index 1f8b2c0d7..91fddbd66 100644
--- a/netbox/vpn/tables/l2vpn.py
+++ b/netbox/vpn/tables/l2vpn.py
@@ -73,12 +73,15 @@ class L2VPNTerminationTable(NetBoxTable):
orderable=False,
verbose_name=_('Object Site')
)
+ tags = columns.TagColumn(
+ url_name='ipam:l2vpntermination_list'
+ )
class Meta(NetBoxTable.Meta):
model = L2VPNTermination
fields = (
'pk', 'l2vpn', 'assigned_object_type', 'assigned_object', 'assigned_object_parent', 'assigned_object_site',
- 'actions',
+ 'tags', 'actions',
)
default_columns = (
'pk', 'l2vpn', 'assigned_object_type', 'assigned_object_parent', 'assigned_object', 'actions',
diff --git a/requirements.txt b/requirements.txt
index a9d7e710c..2c49d5322 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
bleach==6.1.0
-Django==4.2.7
+Django==4.2.8
django-cors-headers==4.3.1
django-debug-toolbar==4.2.0
-django-filter==23.4
+django-filter==23.5
django-graphiql-debug-toolbar==0.2.0
django-mptt==0.14.0
django-pglocks==1.0.4
@@ -10,22 +10,22 @@ django-prometheus==2.3.1
django-redis==5.4.0
django-rich==1.8.0
django-rq==2.9.0
-django-tables2==2.6.0
django-taggit==5.0.1
+django-tables2==2.7.0
django-timezone-field==6.1.0
djangorestframework==3.14.0
-drf-spectacular==0.26.5
-drf-spectacular-sidecar==2023.10.1
-feedparser==6.0.10
+drf-spectacular==0.27.0
+drf-spectacular-sidecar==2023.12.1
+feedparser==6.0.11
graphene-django==3.0.0
gunicorn==21.2.0
Jinja2==3.1.2
Markdown==3.5.1
-mkdocs-material==9.4.14
+mkdocs-material==9.5.2
mkdocstrings[python-legacy]==0.24.0
netaddr==0.9.0
Pillow==10.1.0
-psycopg[binary,pool]==3.1.13
+psycopg[binary,pool]==3.1.15
PyYAML==6.0.1
requests==2.31.0
social-auth-app-django==5.4.0