From bbf4b906e4083dbeadbaa802af5aac18e1896ba3 Mon Sep 17 00:00:00 2001 From: sleepinggenius2 Date: Tue, 26 Jul 2022 17:16:03 -0400 Subject: [PATCH 01/28] Adds patterned_fields support for bulk components --- netbox/dcim/views.py | 1 + netbox/netbox/views/generic/bulk_views.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index ec3e9152e..3bec02f5c 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2707,6 +2707,7 @@ class DeviceBulkAddModuleBayView(generic.BulkComponentCreateView): filterset = filtersets.DeviceFilterSet table = tables.DeviceTable default_return_url = 'dcim:device_list' + patterned_fields = ('name', 'label', 'position') class DeviceBulkAddDeviceBayView(generic.BulkComponentCreateView): diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 5bdf5cbc9..7e07c57d0 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -795,6 +795,7 @@ class BulkComponentCreateView(GetReturnURLMixin, BaseMultiObjectView): model_form = None filterset = None table = None + patterned_fields = ('name', 'label') def get_required_permission(self): return f'dcim.add_{self.queryset.model._meta.model_name}' @@ -830,16 +831,16 @@ class BulkComponentCreateView(GetReturnURLMixin, BaseMultiObjectView): for obj in data['pk']: - names = data['name_pattern'] - labels = data['label_pattern'] if 'label_pattern' in data else None - for i, name in enumerate(names): - label = labels[i] if labels else None - + pattern_count = len(data[f'{self.patterned_fields[0]}_pattern']) + for i in range(pattern_count): component_data = { - self.parent_field: obj.pk, - 'name': name, - 'label': label + self.parent_field: obj.pk } + + for field_name in self.patterned_fields: + if data.get(f'{field_name}_pattern'): + component_data[field_name] = data[f'{field_name}_pattern'][i] + component_data.update(data) component_form = self.model_form(component_data) if component_form.is_valid(): From c6e25f068d7aeb77f18add68ccab9ced6ff68d9a Mon Sep 17 00:00:00 2001 From: Jason Lavoie Date: Tue, 2 Aug 2022 20:39:56 -0400 Subject: [PATCH 02/28] import/export color field on front- and rear-ports for module-types and device-types Closes: #9906 - Adds `color` field to front and rearport template import forms - Adds `color` field to `to_yaml` export for front and rearport templates --- netbox/dcim/forms/object_import.py | 4 ++-- netbox/dcim/models/device_component_templates.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/forms/object_import.py b/netbox/dcim/forms/object_import.py index afbcd6543..606333e83 100644 --- a/netbox/dcim/forms/object_import.py +++ b/netbox/dcim/forms/object_import.py @@ -146,7 +146,7 @@ class FrontPortTemplateImportForm(ComponentTemplateImportForm): class Meta: model = FrontPortTemplate fields = [ - 'device_type', 'module_type', 'name', 'type', 'rear_port', 'rear_port_position', 'label', 'description', + 'device_type', 'module_type', 'name', 'type', 'color', 'rear_port', 'rear_port_position', 'label', 'description', ] @@ -158,7 +158,7 @@ class RearPortTemplateImportForm(ComponentTemplateImportForm): class Meta: model = RearPortTemplate fields = [ - 'device_type', 'module_type', 'name', 'type', 'positions', 'label', 'description', + 'device_type', 'module_type', 'name', 'type', 'color', 'positions', 'label', 'description', ] diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index f596cf28b..74252e480 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -462,6 +462,7 @@ class FrontPortTemplate(ModularComponentTemplateModel): return { 'name': self.name, 'type': self.type, + 'color': self.color, 'rear_port': self.rear_port.name, 'rear_port_position': self.rear_port_position, 'label': self.label, @@ -511,6 +512,7 @@ class RearPortTemplate(ModularComponentTemplateModel): return { 'name': self.name, 'type': self.type, + 'color': self.color, 'positions': self.positions, 'label': self.label, 'description': self.description, From a2e84dd279549c7284184ff98da4a1ce23c646c9 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 3 Aug 2022 15:22:51 -0400 Subject: [PATCH 03/28] Changelog for #9827, #9906 --- docs/release-notes/version-3.2.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 5e538890c..1c7eb79e8 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -11,9 +11,11 @@ * [#9881](https://github.com/netbox-community/netbox/issues/9881) - Increase granularity in utilization graph values * [#9882](https://github.com/netbox-community/netbox/issues/9882) - Add manufacturer column to modules table * [#9883](https://github.com/netbox-community/netbox/issues/9883) - Linkify location column in power panels table +* [#9906](https://github.com/netbox-community/netbox/issues/9906) - Include `color` attribute in front & rear port YAML import/export ### Bug Fixes +* [#9827](https://github.com/netbox-community/netbox/issues/9827) - Fix assignment of module bay position during bulk creation * [#9871](https://github.com/netbox-community/netbox/issues/9871) - Fix utilization graph value alignments * [#9884](https://github.com/netbox-community/netbox/issues/9884) - Prevent querying assigned VRF on prefix object init * [#9885](https://github.com/netbox-community/netbox/issues/9885) - Fix child prefix counts when editing/deleting aggregates in bulk From f874e9932d06653e330da65d93c2fe0fd7720968 Mon Sep 17 00:00:00 2001 From: Osamu-kj Date: Thu, 4 Aug 2022 18:52:25 +0200 Subject: [PATCH 04/28] Added HTML Sanitization to the custom fields --- netbox/netbox/tables/columns.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 7da241566..7774a495f 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -1,4 +1,5 @@ from dataclasses import dataclass +from glob import escape from typing import Optional import django_tables2 as tables @@ -433,21 +434,21 @@ class CustomFieldColumn(tables.Column): def render(self, value): if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is True: - return mark_safe('') + return escape('') if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is False: - return mark_safe('') + return escape('') if self.customfield.type == CustomFieldTypeChoices.TYPE_URL: - return mark_safe(f'{value}') + return escape(f'{value}') if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTISELECT: return ', '.join(v for v in value) if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT: - return mark_safe(', '.join([ + return escape(', '.join([ self._likify_item(obj) for obj in self.customfield.deserialize(value) ])) if value is not None: obj = self.customfield.deserialize(value) - return mark_safe(self._likify_item(obj)) - return self.default + return escape(self._likify_item(obj)) + return escape(self.default) def value(self, value): if isinstance(value, list): From db38ed4f19e5943bf60434f4cfc08d232dbb5e6e Mon Sep 17 00:00:00 2001 From: Osamu-kj Date: Sat, 6 Aug 2022 15:10:31 +0200 Subject: [PATCH 05/28] Fixed the XSS protection code inside custom fields --- netbox/netbox/tables/columns.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 7774a495f..277482512 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -1,5 +1,4 @@ from dataclasses import dataclass -from glob import escape from typing import Optional import django_tables2 as tables @@ -8,6 +7,7 @@ from django.contrib.auth.models import AnonymousUser from django.db.models import DateField, DateTimeField from django.template import Context, Template from django.urls import reverse +from django.utils.html import escape from django.utils.formats import date_format from django.utils.safestring import mark_safe from django_tables2.columns import library @@ -430,25 +430,28 @@ class CustomFieldColumn(tables.Column): def _likify_item(item): if hasattr(item, 'get_absolute_url'): return f'{item}' - return item + return escape(item) def render(self, value): if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is True: - return escape('') + return mark_safe('') if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is False: - return escape('') + return mark_safe('') if self.customfield.type == CustomFieldTypeChoices.TYPE_URL: - return escape(f'{value}') + return mark_safe(f'{escape(value)}') if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTISELECT: return ', '.join(v for v in value) if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT: - return escape(', '.join([ + print (mark_safe(', '.join([ + self._likify_item(obj) for obj in self.customfield.deserialize(value) + ]))) + return mark_safe(', '.join([ self._likify_item(obj) for obj in self.customfield.deserialize(value) ])) if value is not None: obj = self.customfield.deserialize(value) - return escape(self._likify_item(obj)) - return escape(self.default) + return mark_safe(self._likify_item(obj)) + return self.default def value(self, value): if isinstance(value, list): From 7141fc8eb03eeba0d751e7af374f7d6a92ea60cb Mon Sep 17 00:00:00 2001 From: Osamu-kj Date: Sat, 6 Aug 2022 17:17:43 +0200 Subject: [PATCH 06/28] Custom fields - removed the debug lines --- netbox/netbox/tables/columns.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 277482512..573ac058c 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -429,7 +429,7 @@ class CustomFieldColumn(tables.Column): @staticmethod def _likify_item(item): if hasattr(item, 'get_absolute_url'): - return f'{item}' + return f'{escape(item)}' return escape(item) def render(self, value): @@ -442,9 +442,6 @@ class CustomFieldColumn(tables.Column): if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTISELECT: return ', '.join(v for v in value) if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT: - print (mark_safe(', '.join([ - self._likify_item(obj) for obj in self.customfield.deserialize(value) - ]))) return mark_safe(', '.join([ self._likify_item(obj) for obj in self.customfield.deserialize(value) ])) From 0e1947bc4bceaf01d519bc7cc2e9fc09768b0409 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 09:58:58 -0400 Subject: [PATCH 07/28] PEP8 fix --- netbox/netbox/tables/columns.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 573ac058c..e176b9af7 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import AnonymousUser from django.db.models import DateField, DateTimeField from django.template import Context, Template from django.urls import reverse -from django.utils.html import escape +from django.utils.html import escape from django.utils.formats import date_format from django.utils.safestring import mark_safe from django_tables2.columns import library From 135543683db21d2856f5b12311b348e7061ff743 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 10:24:49 -0400 Subject: [PATCH 08/28] Changelog for #9919 --- docs/release-notes/version-3.2.md | 1 + netbox/netbox/tables/columns.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 1c7eb79e8..d13e8db75 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -20,6 +20,7 @@ * [#9884](https://github.com/netbox-community/netbox/issues/9884) - Prevent querying assigned VRF on prefix object init * [#9885](https://github.com/netbox-community/netbox/issues/9885) - Fix child prefix counts when editing/deleting aggregates in bulk * [#9891](https://github.com/netbox-community/netbox/issues/9891) - Ensure consistent ordering for tags during object serialization +* [#9919](https://github.com/netbox-community/netbox/issues/9919) - Fix potential XSS avenue via linked objects in tables --- diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index e176b9af7..f78b9f37c 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -442,9 +442,9 @@ class CustomFieldColumn(tables.Column): if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTISELECT: return ', '.join(v for v in value) if self.customfield.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT: - return mark_safe(', '.join([ + return mark_safe(', '.join( self._likify_item(obj) for obj in self.customfield.deserialize(value) - ])) + )) if value is not None: obj = self.customfield.deserialize(value) return mark_safe(self._likify_item(obj)) From 90317adae77c7aeab79d798c1e6f3a983d18fd8a Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 10:47:07 -0400 Subject: [PATCH 09/28] Clean up usages of mark_safe() --- netbox/dcim/views.py | 5 ++--- netbox/netbox/views/generic/object_views.py | 6 +++--- netbox/utilities/templatetags/builtins/filters.py | 4 ++-- netbox/utilities/templatetags/helpers.py | 4 +--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 3bec02f5c..0bdca686d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3083,7 +3083,7 @@ class VirtualChassisAddMemberView(ObjectPermissionRequiredMixin, GetReturnURLMix if membership_form.is_valid(): membership_form.save() - msg = 'Added member {}'.format(device.get_absolute_url(), escape(device)) + msg = f'Added member {escape(device)}' messages.success(request, mark_safe(msg)) if '_addanother' in request.POST: @@ -3128,8 +3128,7 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL # Protect master device from being removed virtual_chassis = VirtualChassis.objects.filter(master=device).first() if virtual_chassis is not None: - msg = 'Unable to remove master device {} from the virtual chassis.'.format(escape(device)) - messages.error(request, mark_safe(msg)) + messages.error(request, f'Unable to remove master device {device} from the virtual chassis.') return redirect(device.get_absolute_url()) if form.is_valid(): diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 4ebfe71cc..88e078ae3 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -386,10 +386,10 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): ) logger.info(f"{msg} {obj} (PK: {obj.pk})") if hasattr(obj, 'get_absolute_url'): - msg = '{} {}'.format(msg, obj.get_absolute_url(), escape(obj)) + msg = mark_safe(f'{msg} {escape(obj)}') else: - msg = '{} {}'.format(msg, escape(obj)) - messages.success(request, mark_safe(msg)) + msg = f'{msg} {obj}' + messages.success(request, msg) if '_addanother' in request.POST: redirect_url = request.path diff --git a/netbox/utilities/templatetags/builtins/filters.py b/netbox/utilities/templatetags/builtins/filters.py index 5a6841286..bc395e438 100644 --- a/netbox/utilities/templatetags/builtins/filters.py +++ b/netbox/utilities/templatetags/builtins/filters.py @@ -86,8 +86,8 @@ def placeholder(value): """ if value not in ('', None): return value - placeholder = '—' - return mark_safe(placeholder) + + return mark_safe('—') @register.filter() diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index db4d14c24..67ed553b2 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -109,9 +109,7 @@ def annotated_date(date_value): long_ts = date(date_value, 'DATETIME_FORMAT') short_ts = date(date_value, 'SHORT_DATETIME_FORMAT') - span = f'{short_ts}' - - return mark_safe(span) + return mark_safe(f'{short_ts}') @register.simple_tag From 36ac83a319f1dbd1df3752c9ab8f129eefb23f9b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 11:43:27 -0400 Subject: [PATCH 10/28] Fixes #9949: Fix KeyError exception resulting from invalid API token provisioning request --- docs/release-notes/version-3.2.md | 1 + netbox/users/api/views.py | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index d13e8db75..0ee235a82 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -21,6 +21,7 @@ * [#9885](https://github.com/netbox-community/netbox/issues/9885) - Fix child prefix counts when editing/deleting aggregates in bulk * [#9891](https://github.com/netbox-community/netbox/issues/9891) - Ensure consistent ordering for tags during object serialization * [#9919](https://github.com/netbox-community/netbox/issues/9919) - Fix potential XSS avenue via linked objects in tables +* [#9949](https://github.com/netbox-community/netbox/issues/9949) - Fix KeyError exception resulting from invalid API token provisioning request --- diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py index c3495afdf..e5c2bc8ab 100644 --- a/netbox/users/api/views.py +++ b/netbox/users/api/views.py @@ -74,11 +74,11 @@ class TokenProvisionView(APIView): serializer.is_valid() # Authenticate the user account based on the provided credentials - user = authenticate( - request=request, - username=serializer.data['username'], - password=serializer.data['password'] - ) + username = serializer.data.get('username') + password = serializer.data.get('password') + if not username or not password: + raise AuthenticationFailed("Username and password must be provided to provision a token.") + user = authenticate(request=request, username=username, password=password) if user is None: raise AuthenticationFailed("Invalid username/password") From 876251c1cf6da80894780d3856412a2918da9d0e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 11:48:43 -0400 Subject: [PATCH 11/28] Fixes #9948: Fix TypeError exception when requesting API tokens list as non-authenticated user --- docs/release-notes/version-3.2.md | 1 + netbox/users/api/views.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 0ee235a82..745ace110 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -21,6 +21,7 @@ * [#9885](https://github.com/netbox-community/netbox/issues/9885) - Fix child prefix counts when editing/deleting aggregates in bulk * [#9891](https://github.com/netbox-community/netbox/issues/9891) - Ensure consistent ordering for tags during object serialization * [#9919](https://github.com/netbox-community/netbox/issues/9919) - Fix potential XSS avenue via linked objects in tables +* [#9948](https://github.com/netbox-community/netbox/issues/9948) - Fix TypeError exception when requesting API tokens list as non-authenticated user * [#9949](https://github.com/netbox-community/netbox/issues/9949) - Fix KeyError exception resulting from invalid API token provisioning request --- diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py index e5c2bc8ab..66ef92ab7 100644 --- a/netbox/users/api/views.py +++ b/netbox/users/api/views.py @@ -58,6 +58,8 @@ class TokenViewSet(NetBoxModelViewSet): # Workaround for schema generation (drf_yasg) if getattr(self, 'swagger_fake_view', False): return queryset.none() + if not self.request.user.is_authenticated: + return queryset.none() if self.request.user.is_superuser: return queryset return queryset.filter(user=self.request.user) From 8721ad987cf178cc5421f64c28b1772bdabaa967 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 12:22:22 -0400 Subject: [PATCH 12/28] Fixes #9952: Prevent InvalidMove when attempting to assign a nested child object as parent --- docs/release-notes/version-3.2.md | 1 + netbox/netbox/models/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 745ace110..f231b6e58 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -23,6 +23,7 @@ * [#9919](https://github.com/netbox-community/netbox/issues/9919) - Fix potential XSS avenue via linked objects in tables * [#9948](https://github.com/netbox-community/netbox/issues/9948) - Fix TypeError exception when requesting API tokens list as non-authenticated user * [#9949](https://github.com/netbox-community/netbox/issues/9949) - Fix KeyError exception resulting from invalid API token provisioning request +* [#9952](https://github.com/netbox-community/netbox/issues/9952) - Prevent InvalidMove when attempting to assign a nested child object as parent --- diff --git a/netbox/netbox/models/__init__.py b/netbox/netbox/models/__init__.py index b3bfe06c0..ea2feb8de 100644 --- a/netbox/netbox/models/__init__.py +++ b/netbox/netbox/models/__init__.py @@ -89,9 +89,9 @@ class NestedGroupModel(NetBoxFeatureSet, MPTTModel): super().clean() # An MPTT model cannot be its own parent - if self.pk and self.parent_id == self.pk: + if self.pk and self.parent and self.parent in self.get_descendants(include_self=True): raise ValidationError({ - "parent": "Cannot assign self as parent." + "parent": f"Cannot assign self or child {self._meta.verbose_name} as parent." }) From caca074161977fcbd7d3d0cd0e02b42efb3e8184 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 14:21:42 -0400 Subject: [PATCH 13/28] Fixes #9950: Prevent redirection to arbitrary URLs via 'next' parameter on login URL --- docs/release-notes/version-3.2.md | 1 + netbox/users/views.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index f231b6e58..46718837e 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -23,6 +23,7 @@ * [#9919](https://github.com/netbox-community/netbox/issues/9919) - Fix potential XSS avenue via linked objects in tables * [#9948](https://github.com/netbox-community/netbox/issues/9948) - Fix TypeError exception when requesting API tokens list as non-authenticated user * [#9949](https://github.com/netbox-community/netbox/issues/9949) - Fix KeyError exception resulting from invalid API token provisioning request +* [#9950](https://github.com/netbox-community/netbox/issues/9950) - Prevent redirection to arbitrary URLs via `next` parameter on login URL * [#9952](https://github.com/netbox-community/netbox/issues/9952) - Prevent InvalidMove when attempting to assign a nested child object as parent --- diff --git a/netbox/users/views.py b/netbox/users/views.py index 344f375fc..f08cac844 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -10,6 +10,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.decorators import method_decorator +from django.utils.http import url_has_allowed_host_and_scheme from django.views.decorators.debug import sensitive_post_parameters from django.views.generic import View from social_core.backends.utils import load_backends @@ -91,7 +92,7 @@ class LoginView(View): data = request.POST if request.method == "POST" else request.GET redirect_url = data.get('next', settings.LOGIN_REDIRECT_URL) - if redirect_url and redirect_url.startswith('/'): + if redirect_url and url_has_allowed_host_and_scheme(redirect_url, allowed_hosts=None): logger.debug(f"Redirecting user to {redirect_url}") else: if redirect_url: From ce7fb8ab17406a8eba02055c22ec0b6cbe8ef425 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 15:17:36 -0400 Subject: [PATCH 14/28] Release v3.2.8 --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- base_requirements.txt | 2 +- docs/release-notes/version-3.2.md | 2 +- netbox/netbox/settings.py | 2 +- requirements.txt | 12 ++++++------ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 332a0ad75..c26584f32 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -14,7 +14,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v3.2.7 + placeholder: v3.2.8 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index ff9b5e358..e6be95e49 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -14,7 +14,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v3.2.7 + placeholder: v3.2.8 validations: required: true - type: dropdown diff --git a/base_requirements.txt b/base_requirements.txt index 9dc85231b..672ce402c 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -4,7 +4,7 @@ bleach # The Python web framework on which NetBox is built # https://github.com/django/django -Django +Django<4.1 # Django middleware which permits cross-domain API requests # https://github.com/OttoYiu/django-cors-headers diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 46718837e..bf6f2f848 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -1,6 +1,6 @@ # NetBox v3.2 -## v3.2.8 (FUTURE) +## v3.2.8 (2022-08-08) ### Enhancements diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index c7e49c1be..12ab44399 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -29,7 +29,7 @@ django.utils.encoding.force_text = force_str # Environment setup # -VERSION = '3.2.8-dev' +VERSION = '3.2.8' # Hostname HOSTNAME = platform.node() diff --git a/requirements.txt b/requirements.txt index f987ad7ba..59bd1e8cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ bleach==5.0.1 -Django==4.0.6 +Django==4.0.7 django-cors-headers==3.13.0 django-debug-toolbar==3.5.0 django-filter==22.1 @@ -13,22 +13,22 @@ django-tables2==2.4.1 django-taggit==2.1.0 django-timezone-field==5.0 djangorestframework==3.13.1 -drf-yasg[validation]==1.20.0 +drf-yasg[validation]==1.21.3 graphene-django==2.15.0 gunicorn==20.1.0 Jinja2==3.1.2 -Markdown==3.3.7 -markdown-include==0.6.0 +Markdown==3.4.1 +markdown-include==0.7.0 mkdocs-material==8.3.9 mkdocstrings[python-legacy]==0.19.0 netaddr==0.8.0 Pillow==9.2.0 psycopg2-binary==2.9.3 PyYAML==6.0 -sentry-sdk==1.7.0 +sentry-sdk==1.9.2 social-auth-app-django==5.0.0 social-auth-core==4.3.0 -svgwrite==1.4.2 +svgwrite==1.4.3 tablib==3.2.1 tzdata==2022.1 From 064d7f3bd0a803ed55198455e54a29c8f7c0adc2 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 8 Aug 2022 15:34:13 -0400 Subject: [PATCH 15/28] PRVB --- docs/release-notes/version-3.2.md | 4 ++++ netbox/netbox/settings.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index bf6f2f848..56a35cc02 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -1,5 +1,9 @@ # NetBox v3.2 +## v3.2.9 (FUTURE) + +--- + ## v3.2.8 (2022-08-08) ### Enhancements diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 12ab44399..d38289d43 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -29,7 +29,7 @@ django.utils.encoding.force_text = force_str # Environment setup # -VERSION = '3.2.8' +VERSION = '3.2.9-dev' # Hostname HOSTNAME = platform.node() From c7faca948016caa8ce30b3571c8a4e71dc33f70e Mon Sep 17 00:00:00 2001 From: gildarov Date: Tue, 9 Aug 2022 11:56:19 +0300 Subject: [PATCH 16/28] fix typo in virtualization/forms/filtersets.py --- netbox/virtualization/forms/filtersets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py index 88aa1a6c2..2f52850bd 100644 --- a/netbox/virtualization/forms/filtersets.py +++ b/netbox/virtualization/forms/filtersets.py @@ -89,7 +89,7 @@ class VirtualMachineFilterForm( (None, ('q', 'tag')), ('Cluster', ('cluster_group_id', 'cluster_type_id', 'cluster_id')), ('Location', ('region_id', 'site_group_id', 'site_id')), - ('Attriubtes', ('status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'local_context_data')), + ('Attributes', ('status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'local_context_data')), ('Tenant', ('tenant_group_id', 'tenant_id')), ('Contacts', ('contact', 'contact_role', 'contact_group')), ) From 602cf8c5fa371d767af70c6d0d9333c5732e9c7f Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 9 Aug 2022 11:29:42 -0400 Subject: [PATCH 17/28] Fixes #9939: Fix list of next nodes for split paths under trace view --- docs/release-notes/version-3.3.md | 17 ++--------------- netbox/dcim/models/cables.py | 4 ++-- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index 2a3935e5e..74ed7f10c 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -97,22 +97,9 @@ Custom field UI visibility has no impact on API operation. * [#9536](https://github.com/netbox-community/netbox/issues/9536) - Track API token usage times * [#9582](https://github.com/netbox-community/netbox/issues/9582) - Enable assigning config contexts based on device location -### Bug Fixes (from Beta1) +### Bug Fixes (from Beta2) -* [#9728](https://github.com/netbox-community/netbox/issues/9728) - Fix validation when assigning a virtual machine to a device -* [#9729](https://github.com/netbox-community/netbox/issues/9729) - Fix ordering of content type creation to ensure compatability with demo data -* [#9730](https://github.com/netbox-community/netbox/issues/9730) - Fix validation error when creating a new cable via UI form -* [#9733](https://github.com/netbox-community/netbox/issues/9733) - Handle split paths during trace when fanning out to front ports with differing cables -* [#9765](https://github.com/netbox-community/netbox/issues/9765) - Report correct segment count under cable trace UI view -* [#9778](https://github.com/netbox-community/netbox/issues/9778) - Fix exception during cable deletion after deleting a connected termination -* [#9788](https://github.com/netbox-community/netbox/issues/9788) - Ensure denormalized fields on CableTermination are kept in sync with related objects -* [#9789](https://github.com/netbox-community/netbox/issues/9789) - Fix rendering of cable traces ending at provider networks -* [#9794](https://github.com/netbox-community/netbox/issues/9794) - Fix link to connect a rear port to a circuit termination -* [#9818](https://github.com/netbox-community/netbox/issues/9818) - Fix circuit side selection when connecting a cable to a circuit termination -* [#9829](https://github.com/netbox-community/netbox/issues/9829) - Arrange custom fields by group when editing objects -* [#9843](https://github.com/netbox-community/netbox/issues/9843) - Fix rendering of custom field values (regression from #9647) -* [#9844](https://github.com/netbox-community/netbox/issues/9844) - Fix interface api request when creating/editing L2VPN termination -* [#9847](https://github.com/netbox-community/netbox/issues/9847) - Respect `desc_units` when ordering rack units +* [#9939](https://github.com/netbox-community/netbox/issues/9939) - Fix list of next nodes for split paths under trace view ### Plugins API diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index 321d808ff..2be64451f 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -677,6 +677,6 @@ class CablePath(models.Model): """ Return all available next segments in a split cable path. """ - rearport = path_node_to_object(self._nodes[-1]) + rearports = self.path_objects[-1] - return FrontPort.objects.filter(rear_port=rearport) + return FrontPort.objects.filter(rear_port__in=rearports) From 7dc2e02e226445cffc84deae682c8c9cdeed8dc3 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 9 Aug 2022 11:39:04 -0400 Subject: [PATCH 18/28] Fixes #9938: Exclude virtual interfaces from terminations list when connecting a cable --- docs/release-notes/version-3.3.md | 1 + netbox/dcim/forms/connections.py | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index 74ed7f10c..c7d1a30ff 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -99,6 +99,7 @@ Custom field UI visibility has no impact on API operation. ### Bug Fixes (from Beta2) +* [#9938](https://github.com/netbox-community/netbox/issues/9938) - Exclude virtual interfaces from terminations list when connecting a cable * [#9939](https://github.com/netbox-community/netbox/issues/9939) - Fix list of next nodes for split paths under trace view ### Plugins API diff --git a/netbox/dcim/forms/connections.py b/netbox/dcim/forms/connections.py index 7552c0c87..cc5cf362f 100644 --- a/netbox/dcim/forms/connections.py +++ b/netbox/dcim/forms/connections.py @@ -84,6 +84,7 @@ def get_cable_form(a_type, b_type): disabled_indicator='_occupied', query_params={ 'device_id': f'$termination_{cable_end}_device', + 'kind': 'physical', # Exclude virtual interfaces } ) From c1d9cace117fb593fd8e332c370e05096017dac5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 9 Aug 2022 14:21:27 -0400 Subject: [PATCH 19/28] Fixes #9900: Pre-populate site & rack fields for cable connection form --- docs/release-notes/version-3.3.md | 1 + netbox/dcim/tables/template_code.py | 50 ++++++++++---------- netbox/templates/dcim/consoleport.html | 6 +-- netbox/templates/dcim/consoleserverport.html | 6 +-- netbox/templates/dcim/frontport.html | 12 ++--- netbox/templates/dcim/interface.html | 8 ++-- netbox/templates/dcim/powerfeed.html | 2 +- netbox/templates/dcim/poweroutlet.html | 2 +- netbox/templates/dcim/powerport.html | 4 +- netbox/templates/dcim/rearport.html | 8 ++-- 10 files changed, 50 insertions(+), 49 deletions(-) diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index c7d1a30ff..9ec4eb9b5 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -99,6 +99,7 @@ Custom field UI visibility has no impact on API operation. ### Bug Fixes (from Beta2) +* [#9900](https://github.com/netbox-community/netbox/issues/9900) - Pre-populate site & rack fields for cable connection form * [#9938](https://github.com/netbox-community/netbox/issues/9938) - Exclude virtual interfaces from terminations list when connecting a cable * [#9939](https://github.com/netbox-community/netbox/issues/9939) - Fix list of next nodes for split paths under trace view diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index 082df56df..04ef74192 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -121,9 +121,9 @@ CONSOLEPORT_BUTTONS = """ {% else %} @@ -153,9 +153,9 @@ CONSOLESERVERPORT_BUTTONS = """ {% else %} @@ -185,8 +185,8 @@ POWERPORT_BUTTONS = """ {% else %} @@ -212,7 +212,7 @@ POWEROUTLET_BUTTONS = """ {% if not record.mark_connected %} - + {% else %} @@ -262,10 +262,10 @@ INTERFACE_BUTTONS = """ {% else %} @@ -301,12 +301,12 @@ FRONTPORT_BUTTONS = """ {% else %} @@ -338,12 +338,12 @@ REARPORT_BUTTONS = """ {% else %} diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html index f132a4ed8..39ffbf552 100644 --- a/netbox/templates/dcim/consoleport.html +++ b/netbox/templates/dcim/consoleport.html @@ -111,13 +111,13 @@ diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html index f4da080e8..642e758a3 100644 --- a/netbox/templates/dcim/consoleserverport.html +++ b/netbox/templates/dcim/consoleserverport.html @@ -113,13 +113,13 @@ diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html index e5f1df5ae..2ef955fe9 100644 --- a/netbox/templates/dcim/frontport.html +++ b/netbox/templates/dcim/frontport.html @@ -109,22 +109,22 @@ diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 11e776872..7503e1be2 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -263,16 +263,16 @@ diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 3972b30f3..584454df8 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -158,7 +158,7 @@ {% if not object.mark_connected and not object.cable %}
{% if perms.dcim.add_cable %} - + Connect {% endif %} diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index 930d60996..26f4a07f8 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -111,7 +111,7 @@
Not Connected {% if perms.dcim.add_cable %} - + Connect {% endif %} diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html index 6da35617d..c5eccbf14 100644 --- a/netbox/templates/dcim/powerport.html +++ b/netbox/templates/dcim/powerport.html @@ -117,10 +117,10 @@ diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html index ae7b55316..dc53746db 100644 --- a/netbox/templates/dcim/rearport.html +++ b/netbox/templates/dcim/rearport.html @@ -105,16 +105,16 @@ From c24f1f14eccee2eecc67fc8d4df1db6d3e20b679 Mon Sep 17 00:00:00 2001 From: Barnabas Lovas Date: Wed, 10 Aug 2022 13:22:58 +0200 Subject: [PATCH 20/28] Closes #9625: Add Contact Phone/Email to quick view panes to save time --- netbox/templates/inc/panels/contacts.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/netbox/templates/inc/panels/contacts.html b/netbox/templates/inc/panels/contacts.html index 26961f04a..359ad8d7e 100644 --- a/netbox/templates/inc/panels/contacts.html +++ b/netbox/templates/inc/panels/contacts.html @@ -10,6 +10,8 @@ Name Role Priority + Phone + Email {% for contact in contacts %} @@ -17,6 +19,20 @@ {{ contact.contact|linkify }} {{ contact.role|placeholder }} {{ contact.get_priority_display|placeholder }} + + {% if contact.contact.phone %} + {{ contact.contact.phone }} + {% else %} + {{ ''|placeholder }} + {% endif %} + + + {% if contact.contact.email %} + {{ contact.contact.email }} + {% else %} + {{ ''|placeholder }} + {% endif %} + {% if perms.tenancy.change_contactassignment %} From 8f1e70f01d761f65382bb01d568e5f60ae47aa68 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 10 Aug 2022 15:24:45 -0400 Subject: [PATCH 21/28] Fixes #9961: Correct typo --- docs/models/dcim/frontport.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/models/dcim/frontport.md b/docs/models/dcim/frontport.md index 0b753c012..6f12e8cbf 100644 --- a/docs/models/dcim/frontport.md +++ b/docs/models/dcim/frontport.md @@ -1,3 +1,3 @@ ## Front Ports -Front ports are pass-through ports used to represent physical cable connections that comprise part of a longer path. For example, the ports on the front face of a UTP patch panel would be modeled in NetBox as front ports. Each port is assigned a physical type, and must be mapped to a specific rear port on the same device. A single rear port may be mapped to multiple rear ports, using numeric positions to annotate the specific alignment of each. +Front ports are pass-through ports used to represent physical cable connections that comprise part of a longer path. For example, the ports on the front face of a UTP patch panel would be modeled in NetBox as front ports. Each port is assigned a physical type, and must be mapped to a specific rear port on the same device. A single rear port may be mapped to multiple front ports, using numeric positions to annotate the specific alignment of each. From a9aaa8939c2bc15ff59f82d547ae4daa45234561 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 10 Aug 2022 16:08:52 -0400 Subject: [PATCH 22/28] Closes #9161: Pretty print JSON custom field data when editing --- docs/release-notes/version-3.2.md | 2 ++ netbox/extras/models/customfields.py | 4 ++-- netbox/project-static/dist/netbox-dark.css | Bin 374410 -> 374221 bytes netbox/project-static/dist/netbox-light.css | Bin 232175 -> 232088 bytes netbox/project-static/dist/netbox-print.css | Bin 727867 -> 727384 bytes netbox/project-static/styles/netbox.scss | 5 +---- netbox/utilities/forms/fields/fields.py | 1 + netbox/utilities/forms/forms.py | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 56a35cc02..a5bd05cde 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -2,6 +2,8 @@ ## v3.2.9 (FUTURE) +* [#9161](https://github.com/netbox-community/netbox/issues/9161) - Pretty print JSON custom field data when editing + --- ## v3.2.8 (2022-08-08) diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py index b7d77e550..55b7a9f03 100644 --- a/netbox/extras/models/customfields.py +++ b/netbox/extras/models/customfields.py @@ -18,7 +18,7 @@ from netbox.models.features import ExportTemplatesMixin, WebhooksMixin from utilities import filters from utilities.forms import ( CSVChoiceField, CSVMultipleChoiceField, DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField, - LaxURLField, StaticSelectMultiple, StaticSelect, add_blank_choice, + JSONField, LaxURLField, StaticSelectMultiple, StaticSelect, add_blank_choice, ) from utilities.querysets import RestrictedQuerySet from utilities.validators import validate_regex @@ -343,7 +343,7 @@ class CustomField(ExportTemplatesMixin, WebhooksMixin, ChangeLoggedModel): # JSON elif self.type == CustomFieldTypeChoices.TYPE_JSON: - field = forms.JSONField(required=required, initial=initial) + field = JSONField(required=required, initial=initial) # Object elif self.type == CustomFieldTypeChoices.TYPE_OBJECT: diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index b929f176a6c67c2067c4f29044f724d50ccbd60b..c6e69db89fe9d6f02b4d9600fc1d70b2ca3c7bab 100644 GIT binary patch delta 44 zcmeBrD|Ys^SVIeA3sVbo3(FQ(>*>>Lrn8z%zQ2i=GdeFZH`O+|xNN)A3|0?00G8Pi A9{>OV delta 108 zcmX^6TCD4>SVIeA3sVbo3(FQ(>*-?3nJMu(`N@en@yYplC8-r9@hOQViIWdXs!Yy* z#xdPyI;$}+NKHX$Qch-ae0J*e##Ba?$$8I2r`Jqp<$@{{;fl^n%uTfg>D}Hsoz+7Q E0PR&NdH?_b diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index 341369adff9033ea697bf89ab50ae0c592c00e73..c3f8b80a69ea3e2cd756bc65c9a32709a7af0d4f 100644 GIT binary patch delta 40 wcmaDqm2bvWzJ?aY7N#xCyGuFsaubWPQ}WC6CKq;!O&2I*=Gtyu#=J!Y07M%O+5i9m delta 109 zcmbO+mGAvjzJ?aY7N#xCyG!krGgIPo@{<#D;*<09N>VFI;!_e!5_LeV#G=$hz1+m2 y?3DcSJh%u*LqTa$PG)j^c53D1!cMX2w@R70Kn$+vyu{p8TaW?UAD1$36#)QFI4eQ` diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index 61bcedf9c0ec303c353a88390cdb00e18b3f5aaf..3b10f5c27c1c4d3fea800feadc6b56b2fb229115 100644 GIT binary patch delta 101 zcmV-r0Gj{1wk+7PEP#XogaU*Egam{Iga(8Mgb0KQvuC6iz(2b1tR2bb{M3N(|@EeMw&-3kbox!ejgm#F7M2#)7Pc1l7LFFqEnLmF#FaBs;&bwo6LaE|^YcnlD@x*1 z5=#%n@fJW`fV=V=^FwWdAOqCj@~}+HrFm&09QI|KL7v# diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index a54b6c324..8ef280397 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -714,11 +714,8 @@ textarea.form-control[rows='10'] { height: 18rem; } -textarea#id_local_context_data, textarea.markdown, -textarea#id_public_key, -textarea.form-control[name='csv'], -textarea.form-control[name='data'] { +textarea.form-control[name='csv'] { font-family: $font-family-monospace; } diff --git a/netbox/utilities/forms/fields/fields.py b/netbox/utilities/forms/fields/fields.py index 9168189a1..df69339e5 100644 --- a/netbox/utilities/forms/fields/fields.py +++ b/netbox/utilities/forms/fields/fields.py @@ -99,6 +99,7 @@ class JSONField(_JSONField): if not self.help_text: self.help_text = 'Enter context data in JSON format.' self.widget.attrs['placeholder'] = '' + self.widget.attrs['class'] = 'font-monospace' def prepare_value(self, value): if isinstance(value, InvalidJSONInput): diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py index 3b5cd8308..8ad6f103b 100644 --- a/netbox/utilities/forms/forms.py +++ b/netbox/utilities/forms/forms.py @@ -136,7 +136,7 @@ class ImportForm(BootstrapMixin, forms.Form): Generic form for creating an object from JSON/YAML data """ data = forms.CharField( - widget=forms.Textarea, + widget=forms.Textarea(attrs={'class': 'font-monospace'}), help_text="Enter object data in JSON or YAML format. Note: Only a single object/document is supported." ) format = forms.ChoiceField( From aabe8f7c5b4b61ca87623b496d127266aa443a52 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 10 Aug 2022 16:18:30 -0400 Subject: [PATCH 23/28] Changelog for #9625 --- docs/release-notes/version-3.2.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index a5bd05cde..598ee7874 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -2,7 +2,10 @@ ## v3.2.9 (FUTURE) +### Enhancements + * [#9161](https://github.com/netbox-community/netbox/issues/9161) - Pretty print JSON custom field data when editing +* [#9625](https://github.com/netbox-community/netbox/issues/9625) - Add phone & email details to contacts panel --- From f74b7aa7acb6ee9f84e9d4ff237c33bac92cc0d8 Mon Sep 17 00:00:00 2001 From: Jonathan Senecal Date: Tue, 9 Aug 2022 17:32:20 -0400 Subject: [PATCH 24/28] Add a "clear" button for quick search Fixes #9857 --- netbox/project-static/dist/netbox-dark.css | Bin 374221 -> 375157 bytes netbox/project-static/dist/netbox-light.css | Bin 232088 -> 232694 bytes netbox/project-static/dist/netbox-print.css | Bin 727384 -> 729266 bytes netbox/project-static/dist/netbox.js | Bin 375907 -> 376463 bytes netbox/project-static/dist/netbox.js.map | Bin 345348 -> 345789 bytes netbox/project-static/src/search.ts | 44 ++++++ netbox/project-static/styles/netbox.scss | 21 +++ netbox/project-static/styles/overrides.scss | 8 + netbox/project-static/styles/theme-dark.scss | 4 + netbox/project-static/styles/theme-light.scss | 3 +- netbox/project-static/styles/utilities.scss | 6 + netbox/templates/dcim/device/interfaces.html | 145 +++++++++--------- netbox/templates/inc/table_controls_htmx.html | 34 ++-- 13 files changed, 169 insertions(+), 96 deletions(-) diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index c6e69db89fe9d6f02b4d9600fc1d70b2ca3c7bab..94718ac407f4e5b8c9acba2d7c97c9936fc79765 100644 GIT binary patch delta 597 zcmb7=y-EW?0E9{IqJn~j_=8%U8Vk?tkwmoEpwFPCh~Q>#^_E~Y+5P~z3FHi+O4B!&X1yYpj>QO9d z|Dk~q!^8*8-G#OFKg0!*p|4~=zx9v&HyDfb&6PQ&#e$jDZDu4|&mFTJcN~wp1o%iQ zfIaHF798lPL?z8rpQ;M%#azPl4oZMl@1=Tu#5oNqE@W5s4GZfKQGU1RL3)yhMuu7YZ?zI|r1xqzp6Z^pML#|?q zxUB?YlJ?GKZ~$nfWr_y~_gF0_E3Nkdr1wUR)!m;=7W8*t%0)<@zwOs_p=$Ft(1P8a9>IA<6lW+wFx4Z2G Vh>n+>egzDdLUsZYw*!6!ayxcD8N>hp diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index c3f8b80a69ea3e2cd756bc65c9a32709a7af0d4f..bf0ba2f62028e5344fcee1c4c872304e047234d6 100644 GIT binary patch delta 560 zcma)2y-EW?7$kS3iJHP65UUjto9uZP5oAv-ZEXdy*xOsUk6d;yw|mhTBntWjBCEZR zpj_z-*yIuP39M|RG3qH6ru)8OW|*1ltLp1b_4K@SXZeF3h$Pedx|8rN#c9f-148g2 z4;rBH2*4p{GNl@%sExs9R4^XnAk%sb!6u7v%2gI?HLj#kT+UA~RTiO{$W&9Ib26~< z(uNa3$Z<@S#w>z3M5MU8ZBP(E47x+!X(1QBOeh<^?){5>OOeycfHg+V(cijVbJj1- znFr6BEPpV~_OrE6$7}WEs7T@;V-O)fBA)C1KxL+55S$1pxM}U$Gv;xpG-XyjYoe!9 zDijPyCPhZ%s@i8hF7M2#)7Pc1l7LF~PB~8;6^*DtmE4j!|SJ2}WQL@r4Pfg0s zEYU4aO)N^z&`nOvOHR$vO)4!Z$@np0AYp->!$!pVj%dN8YP z!3;5Ul@P0^H~KMZffe8~im(cxWg3$eSlM9~n!`D`EEQbMqK)5Df+{Ajb5Wi?t$|B^ zdciw3*6meIoI0$6dKsB1sk%9d#U;AQ8JRgL3ey|)Sv4kq;N;-PB4MD5uG|WtwYn^` zI5R0TC$pr|3aBh4HE()j8mCPiG%9ov7 zkidZulbSx!i$!$$0bX{l>GQkTM4>W;+MI?6rWQy~B-k8C0#SgZjOyIPqV&u>-JI04 z5-VL}qk;;>%-n+fqLReC66-46%)FG;3M)ec10>P>(vqCayi}{a{Jd0{@brXhED|6m zaBGzmCFT`pmSpDVSs^^CU{I`+Uyzs#^s|DVQLzHZfW+yB(u`ulm~K*-Zupl;3#)|S mVJ7VWEIO<*^2<_-s-ad`nHs2C6LyCok~>7Vzh2ChTM7Wc!7`fw delta 68 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 delta 19478 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 NWqw?$eUNj`_&>7kHAesd diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 60656bc6d6f3450acca6ca6d4369da29b4749527..9b92d1489c63f744f04a6085c653d32bd45b6331 100644 GIT binary patch delta 495 zcmZ8e!AiqG5JioMc<|JlpD>{4p@^rq)1-v3)DUW#V;Xv>RIB2__7V>{37+#2f+wLT zKfvGcOPtvRQoJlPZ)e|o^R{~HeZTi!tDS1M+WYc8@^XA(CCV7kZ=**eU_?uUc)|5& z?iFQx8&K{Hi4{@ltRyNm17>pYvooAh2R<6`n*X~J*^K5!2#xwmlyBwM><=0sfs%>JYv=S42XU*m3KR!e7Ag%jYLgCCHKy { + const search = new Event('search'); + quicksearch.value = ''; + await new Promise(f => setTimeout(f, 100)); + quicksearch.dispatchEvent(search); + }, { + passive: true + }) + } + } +} + export function initSearch(): void { for (const func of [initSearchBar]) { func(); } + initQuickSearch(); } diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index 8ef280397..d78e9e9b9 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -416,6 +416,27 @@ nav.search { } } +// Styles for the quicksearch and its clear button; +// Overrides input-group styles and adds transition effects +.quicksearch { + input[type="search"] { + border-radius: $border-radius !important; + } + + button { + margin-left: -32px !important; + z-index: 100 !important; + outline: none !important; + border-radius: $border-radius !important; + transition: visibility 0s, opacity 0.2s linear; + } + + button :hover { + opacity: 50%; + transition: visibility 0s, opacity 0.1s linear; + } +} + main.layout { display: flex; flex-wrap: nowrap; diff --git a/netbox/project-static/styles/overrides.scss b/netbox/project-static/styles/overrides.scss index 03c72c6e6..7fa366df8 100644 --- a/netbox/project-static/styles/overrides.scss +++ b/netbox/project-static/styles/overrides.scss @@ -34,3 +34,11 @@ a[type='button'] { .badge { font-size: $font-size-xs; } + +/* clears the 'X' in search inputs from webkit browsers */ +input[type='search']::-webkit-search-decoration, +input[type='search']::-webkit-search-cancel-button, +input[type='search']::-webkit-search-results-button, +input[type='search']::-webkit-search-results-decoration { + -webkit-appearance: none !important; +} diff --git a/netbox/project-static/styles/theme-dark.scss b/netbox/project-static/styles/theme-dark.scss index c0933e991..4bbe5cea5 100644 --- a/netbox/project-static/styles/theme-dark.scss +++ b/netbox/project-static/styles/theme-dark.scss @@ -92,6 +92,10 @@ $input-focus-color: $input-color; $input-placeholder-color: $gray-700; $input-plaintext-color: $body-color; +input { + color-scheme: dark; +} + $form-check-input-active-filter: brightness(90%); $form-check-input-bg: $input-bg; $form-check-input-border: 1px solid rgba(255, 255, 255, 0.25); diff --git a/netbox/project-static/styles/theme-light.scss b/netbox/project-static/styles/theme-light.scss index d417e1bf6..c9478f1cc 100644 --- a/netbox/project-static/styles/theme-light.scss +++ b/netbox/project-static/styles/theme-light.scss @@ -22,7 +22,6 @@ $theme-colors: ( 'danger': $danger, 'light': $light, 'dark': $dark, - // General-purpose palette 'blue': $blue-500, 'indigo': $indigo-500, @@ -36,7 +35,7 @@ $theme-colors: ( 'cyan': $cyan-500, 'gray': $gray-500, 'black': $black, - 'white': $white, + 'white': $white ); $light: $gray-200; diff --git a/netbox/project-static/styles/utilities.scss b/netbox/project-static/styles/utilities.scss index cd8ccc46b..a5a4bf038 100644 --- a/netbox/project-static/styles/utilities.scss +++ b/netbox/project-static/styles/utilities.scss @@ -42,3 +42,9 @@ table td { visibility: visible !important; } } + +// Hides the last child of an element +.hide-last-child :last-child { + visibility: hidden; + opacity: 0; +} diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html index 22f6d8be5..79a9d6b6f 100644 --- a/netbox/templates/dcim/device/interfaces.html +++ b/netbox/templates/dcim/device/interfaces.html @@ -4,84 +4,85 @@ {% load static %} {% block content %} -
-
-
- -
+
+
+
+ +
-
-
- {% if request.user.is_authenticated %} - - {% endif %} - -
    - - -
-
+
+
+
+ {% if request.user.is_authenticated %} + + {% endif %} + +
    + + +
+
+
+
+ +
+ {% csrf_token %} + + +
+
+ {% include 'htmx/table.html' %}
- - {% csrf_token %} - - -
-
- {% include 'htmx/table.html' %} -
+
+
+ {% if perms.dcim.change_interface %} + + + + {% endif %} + {% if perms.dcim.delete_interface %} + + {% endif %}
- -
-
- {% if perms.dcim.change_interface %} - - - - {% endif %} - {% if perms.dcim.delete_interface %} - - {% endif %} -
- {% if perms.dcim.add_interface %} -
- - Add Interfaces - -
- {% endif %} + {% if perms.dcim.add_interface %} +
+ + Add Interfaces +
- + {% endif %} +
+ {% endblock %} {% block modals %} - {{ block.super }} - {% table_config_form table %} -{% endblock modals %} +{{ block.super }} +{% table_config_form table %} +{% endblock modals %} \ No newline at end of file diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html index ab8167bc0..099ad537e 100644 --- a/netbox/templates/inc/table_controls_htmx.html +++ b/netbox/templates/inc/table_controls_htmx.html @@ -2,31 +2,21 @@
-
- +
+ +
{% if request.user.is_authenticated and table_modal %} -
- -
+
+ +
{% endif %}
-
+
\ No newline at end of file From 8cd5a24409c993cc3533a1bfa03a95cf2a2f42b6 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 11 Aug 2022 09:58:37 -0400 Subject: [PATCH 25/28] #9414: Clean up clone_fields on all models --- netbox/circuits/models/circuits.py | 4 ++-- netbox/circuits/models/providers.py | 4 ++-- netbox/dcim/models/device_components.py | 23 +++++++++++++---------- netbox/dcim/models/devices.py | 11 ++++++----- netbox/dcim/models/power.py | 6 +++--- netbox/dcim/models/racks.py | 4 ++-- netbox/dcim/models/sites.py | 10 +++++----- netbox/ipam/models/fhrp.py | 2 +- netbox/ipam/models/ip.py | 18 +++++++++--------- netbox/ipam/models/vrfs.py | 4 ++-- netbox/tenancy/models/contacts.py | 8 ++++---- netbox/tenancy/models/tenants.py | 4 ++-- netbox/virtualization/models.py | 10 +++++----- netbox/wireless/models.py | 2 ++ 14 files changed, 58 insertions(+), 52 deletions(-) diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index d82878cde..c78ea81c7 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -125,9 +125,9 @@ class Circuit(NetBoxModel): null=True ) - clone_fields = [ + clone_fields = ( 'provider', 'type', 'status', 'tenant', 'install_date', 'termination_date', 'commit_rate', 'description', - ] + ) class Meta: ordering = ['provider', 'cid'] diff --git a/netbox/circuits/models/providers.py b/netbox/circuits/models/providers.py index 4211a54a6..e136e13ea 100644 --- a/netbox/circuits/models/providers.py +++ b/netbox/circuits/models/providers.py @@ -61,9 +61,9 @@ class Provider(NetBoxModel): to='tenancy.ContactAssignment' ) - clone_fields = [ + clone_fields = ( 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', - ] + ) class Meta: ordering = ['name'] diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 5e2fc348e..838336e21 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -263,7 +263,7 @@ class ConsolePort(ModularComponentModel, CabledObjectModel, PathEndpoint): help_text='Port speed in bits per second' ) - clone_fields = ['device', 'type', 'speed'] + clone_fields = ('device', 'module', 'type', 'speed') class Meta: ordering = ('device', '_name') @@ -290,7 +290,7 @@ class ConsoleServerPort(ModularComponentModel, CabledObjectModel, PathEndpoint): help_text='Port speed in bits per second' ) - clone_fields = ['device', 'type', 'speed'] + clone_fields = ('device', 'module', 'type', 'speed') class Meta: ordering = ('device', '_name') @@ -327,7 +327,7 @@ class PowerPort(ModularComponentModel, CabledObjectModel, PathEndpoint): help_text="Allocated power draw (watts)" ) - clone_fields = ['device', 'maximum_draw', 'allocated_draw'] + clone_fields = ('device', 'module', 'maximum_draw', 'allocated_draw') class Meta: ordering = ('device', '_name') @@ -441,7 +441,7 @@ class PowerOutlet(ModularComponentModel, CabledObjectModel, PathEndpoint): help_text="Phase (for three-phase feeds)" ) - clone_fields = ['device', 'type', 'power_port', 'feed_leg'] + clone_fields = ('device', 'module', 'type', 'power_port', 'feed_leg') class Meta: ordering = ('device', '_name') @@ -672,7 +672,10 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd related_query_name='interface', ) - clone_fields = ['device', 'parent', 'bridge', 'lag', 'type', 'mgmt_only', 'poe_mode', 'poe_type'] + clone_fields = ( + 'device', 'module', 'parent', 'bridge', 'lag', 'type', 'mgmt_only', 'mtu', 'mode', 'speed', 'duplex', 'rf_role', + 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'poe_mode', 'poe_type', 'vrf', + ) class Meta: ordering = ('device', CollateAsChar('_name')) @@ -890,7 +893,7 @@ class FrontPort(ModularComponentModel, CabledObjectModel): ] ) - clone_fields = ['device', 'type'] + clone_fields = ('device', 'type', 'color') class Meta: ordering = ('device', '_name') @@ -937,7 +940,7 @@ class RearPort(ModularComponentModel, CabledObjectModel): MaxValueValidator(REARPORT_POSITIONS_MAX) ] ) - clone_fields = ['device', 'type', 'positions'] + clone_fields = ('device', 'type', 'color', 'positions') class Meta: ordering = ('device', '_name') @@ -972,7 +975,7 @@ class ModuleBay(ComponentModel): help_text='Identifier to reference when renaming installed components' ) - clone_fields = ['device'] + clone_fields = ('device',) class Meta: ordering = ('device', '_name') @@ -994,7 +997,7 @@ class DeviceBay(ComponentModel): null=True ) - clone_fields = ['device'] + clone_fields = ('device',) class Meta: ordering = ('device', '_name') @@ -1131,7 +1134,7 @@ class InventoryItem(MPTTModel, ComponentModel): objects = TreeManager() - clone_fields = ['device', 'parent', 'role', 'manufacturer', 'part_id'] + clone_fields = ('device', 'parent', 'role', 'manufacturer', 'part_id',) class Meta: ordering = ('device__id', 'parent__id', '_name') diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index f21176d8d..136fcf6cf 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -135,9 +135,9 @@ class DeviceType(NetBoxModel): blank=True ) - clone_fields = [ + clone_fields = ( 'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role', 'airflow', - ] + ) class Meta: ordering = ['manufacturer', 'model'] @@ -630,9 +630,10 @@ class Device(NetBoxModel, ConfigContextModel): objects = ConfigContextModelQuerySet.as_manager() - clone_fields = [ - 'device_type', 'device_role', 'tenant', 'platform', 'site', 'location', 'rack', 'status', 'airflow', 'cluster', - ] + clone_fields = ( + 'device_type', 'device_role', 'tenant', 'platform', 'site', 'location', 'rack', 'face', 'status', 'airflow', + 'cluster', 'virtual_chassis', + ) class Meta: ordering = ('_name', 'pk') # Name may be null diff --git a/netbox/dcim/models/power.py b/netbox/dcim/models/power.py index 94767c6c4..c275691c0 100644 --- a/netbox/dcim/models/power.py +++ b/netbox/dcim/models/power.py @@ -126,10 +126,10 @@ class PowerFeed(NetBoxModel, PathEndpoint, CabledObjectModel): blank=True ) - clone_fields = [ + clone_fields = ( 'power_panel', 'rack', 'status', 'type', 'mark_connected', 'supply', 'phase', 'voltage', 'amperage', - 'max_utilization', 'available_power', - ] + 'max_utilization', + ) class Meta: ordering = ['power_panel', 'name'] diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 4dcfcde28..50c91b52e 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -183,10 +183,10 @@ class Rack(NetBoxModel): to='extras.ImageAttachment' ) - clone_fields = [ + clone_fields = ( 'site', 'location', 'tenant', 'status', 'role', 'type', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', - ] + ) class Meta: ordering = ('site', 'location', '_name', 'pk') # (site, location, name) may be non-unique diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index 9b7ffdcf4..67bcc6e4c 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -295,10 +295,10 @@ class Site(NetBoxModel): to='extras.ImageAttachment' ) - clone_fields = [ - 'status', 'region', 'group', 'tenant', 'facility', 'time_zone', 'description', 'physical_address', - 'shipping_address', 'latitude', 'longitude', - ] + clone_fields = ( + 'status', 'region', 'group', 'tenant', 'facility', 'time_zone', 'physical_address', 'shipping_address', + 'latitude', 'longitude', 'description', + ) class Meta: ordering = ('_name',) @@ -372,7 +372,7 @@ class Location(NestedGroupModel): to='extras.ImageAttachment' ) - clone_fields = ['site', 'parent', 'status', 'tenant', 'description'] + clone_fields = ('site', 'parent', 'status', 'tenant', 'description') class Meta: ordering = ['site', 'name'] diff --git a/netbox/ipam/models/fhrp.py b/netbox/ipam/models/fhrp.py index 2a8d1bdcd..286251444 100644 --- a/netbox/ipam/models/fhrp.py +++ b/netbox/ipam/models/fhrp.py @@ -48,7 +48,7 @@ class FHRPGroup(NetBoxModel): related_query_name='fhrpgroup' ) - clone_fields = ('protocol', 'auth_type', 'auth_key') + clone_fields = ('protocol', 'auth_type', 'auth_key', 'description') class Meta: ordering = ['protocol', 'group_id', 'pk'] diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index 9ad763920..26cee8100 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -175,9 +175,9 @@ class Aggregate(GetAvailablePrefixesMixin, NetBoxModel): blank=True ) - clone_fields = [ + clone_fields = ( 'rir', 'tenant', 'date_added', 'description', - ] + ) class Meta: ordering = ('prefix', 'pk') # prefix may be non-unique @@ -360,9 +360,9 @@ class Prefix(GetAvailablePrefixesMixin, NetBoxModel): objects = PrefixQuerySet.as_manager() - clone_fields = [ + clone_fields = ( 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'description', - ] + ) class Meta: ordering = (F('vrf').asc(nulls_first=True), 'prefix', 'pk') # (vrf, prefix) may be non-unique @@ -608,9 +608,9 @@ class IPRange(NetBoxModel): blank=True ) - clone_fields = [ + clone_fields = ( 'vrf', 'tenant', 'status', 'role', 'description', - ] + ) class Meta: ordering = (F('vrf').asc(nulls_first=True), 'start_address', 'pk') # (vrf, start_address) may be non-unique @@ -836,9 +836,9 @@ class IPAddress(NetBoxModel): objects = IPAddressManager() - clone_fields = [ - 'vrf', 'tenant', 'status', 'role', 'description', - ] + clone_fields = ( + 'vrf', 'tenant', 'status', 'role', 'dns_name', 'description', + ) class Meta: ordering = ('address', 'pk') # address may be non-unique diff --git a/netbox/ipam/models/vrfs.py b/netbox/ipam/models/vrfs.py index fc34b5488..a926bec3e 100644 --- a/netbox/ipam/models/vrfs.py +++ b/netbox/ipam/models/vrfs.py @@ -55,9 +55,9 @@ class VRF(NetBoxModel): blank=True ) - clone_fields = [ + clone_fields = ( 'tenant', 'enforce_unique', 'description', - ] + ) class Meta: ordering = ('name', 'rd', 'pk') # (name, rd) may be non-unique diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py index 75ec9f69c..41881f853 100644 --- a/netbox/tenancy/models/contacts.py +++ b/netbox/tenancy/models/contacts.py @@ -112,9 +112,9 @@ class Contact(NetBoxModel): blank=True ) - clone_fields = [ - 'group', - ] + clone_fields = ( + 'group', 'name', 'title', 'phone', 'email', 'address', 'link', + ) class Meta: ordering = ['name'] @@ -155,7 +155,7 @@ class ContactAssignment(WebhooksMixin, ChangeLoggedModel): blank=True ) - clone_fields = ('content_type', 'object_id') + clone_fields = ('content_type', 'object_id', 'role', 'priority') class Meta: ordering = ('priority', 'contact') diff --git a/netbox/tenancy/models/tenants.py b/netbox/tenancy/models/tenants.py index 88d8d52f1..b0ccd1cb2 100644 --- a/netbox/tenancy/models/tenants.py +++ b/netbox/tenancy/models/tenants.py @@ -76,9 +76,9 @@ class Tenant(NetBoxModel): to='tenancy.ContactAssignment' ) - clone_fields = [ + clone_fields = ( 'group', 'description', - ] + ) class Meta: ordering = ['name'] diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py index f07b176e7..21bc799be 100644 --- a/netbox/virtualization/models.py +++ b/netbox/virtualization/models.py @@ -153,9 +153,9 @@ class Cluster(NetBoxModel): to='tenancy.ContactAssignment' ) - clone_fields = [ - 'type', 'group', 'tenant', 'site', - ] + clone_fields = ( + 'type', 'group', 'status', 'tenant', 'site', + ) class Meta: ordering = ['name'] @@ -299,9 +299,9 @@ class VirtualMachine(NetBoxModel, ConfigContextModel): objects = ConfigContextModelQuerySet.as_manager() - clone_fields = [ + clone_fields = ( 'site', 'cluster', 'device', 'tenant', 'platform', 'status', 'role', 'vcpus', 'memory', 'disk', - ] + ) class Meta: ordering = ('_name', 'pk') # Name may be non-unique diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index dd3945d50..0540e9c45 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -113,6 +113,8 @@ class WirelessLAN(WirelessAuthenticationBase, NetBoxModel): blank=True ) + clone_fields = ('ssid', 'group', 'tenant', 'description') + class Meta: ordering = ('ssid', 'pk') verbose_name = 'Wireless LAN' From e2d53139403218ce47b46b8808580b174f1b3dc6 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 11 Aug 2022 13:02:37 -0400 Subject: [PATCH 26/28] Changelog for #9857 --- docs/release-notes/version-3.2.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 598ee7874..e57cea3b3 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -6,6 +6,7 @@ * [#9161](https://github.com/netbox-community/netbox/issues/9161) - Pretty print JSON custom field data when editing * [#9625](https://github.com/netbox-community/netbox/issues/9625) - Add phone & email details to contacts panel +* [#9857](https://github.com/netbox-community/netbox/issues/9857) - Add clear button to quick search fields --- From c635f09e058877a462c7f8e8a44aa1fad1f0997e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 12 Aug 2022 09:21:28 -0400 Subject: [PATCH 27/28] Closes #9994: Disable search indexing for local documentation builds --- docs/_theme/main.html | 9 +++++++++ mkdocs.yml | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 docs/_theme/main.html diff --git a/docs/_theme/main.html b/docs/_theme/main.html new file mode 100644 index 000000000..4dfc4e14e --- /dev/null +++ b/docs/_theme/main.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block site_meta %} + {{ super() }} + {# Disable search indexing unless we're building for ReadTheDocs #} + {% if not config.extra.readthedocs %} + + {% endif %} +{% endblock %} diff --git a/mkdocs.yml b/mkdocs.yml index 34c65ed01..b13ab6c49 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -5,6 +5,7 @@ repo_name: netbox-community/netbox repo_url: https://github.com/netbox-community/netbox theme: name: material + custom_dir: docs/_theme/ icon: repo: fontawesome/brands/github palette: @@ -37,6 +38,7 @@ plugins: show_root_toc_entry: false show_source: false extra: + readthedocs: !ENV READTHEDOCS social: - icon: fontawesome/brands/github link: https://github.com/netbox-community/netbox From 41ad9b242c468fd3b868037320df7f4fd6123e0b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 12 Aug 2022 10:12:01 -0400 Subject: [PATCH 28/28] Fixes #9986: Workaround for upstream timezone data bug --- docs/release-notes/version-3.2.md | 4 ++++ requirements.txt | 3 +++ 2 files changed, 7 insertions(+) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index e57cea3b3..c572328bc 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -8,6 +8,10 @@ * [#9625](https://github.com/netbox-community/netbox/issues/9625) - Add phone & email details to contacts panel * [#9857](https://github.com/netbox-community/netbox/issues/9857) - Add clear button to quick search fields +### Bug Fixes + +* [#9986](https://github.com/netbox-community/netbox/issues/9986) - Workaround for upstream timezone data bug + --- ## v3.2.8 (2022-08-08) diff --git a/requirements.txt b/requirements.txt index 59bd1e8cd..a227971fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,3 +34,6 @@ tzdata==2022.1 # Workaround for #7401 jsonschema==3.2.0 + +# Workaround for #9986 +pytz==2022.1