diff --git a/docs/customization/custom-validation.md b/docs/customization/custom-validation.md index 79aa82bc9..e9bc6302a 100644 --- a/docs/customization/custom-validation.md +++ b/docs/customization/custom-validation.md @@ -4,7 +4,7 @@ NetBox validates every object prior to it being written to the database to ensur ## Custom Validation Rules -Custom validation rules are expressed as a mapping of model attributes to a set of rules to which that attribute must conform. For example: +Custom validation rules are expressed as a mapping of object attributes to a set of rules to which that attribute must conform. For example: ```json { @@ -17,6 +17,8 @@ Custom validation rules are expressed as a mapping of model attributes to a set This defines a custom validator which checks that the length of the `name` attribute for an object is at least five characters long, and no longer than 30 characters. This validation is executed _after_ NetBox has performed its own internal validation. +### Validation Types + The `CustomValidator` class supports several validation types: * `min`: Minimum value @@ -34,16 +36,33 @@ The `min` and `max` types should be defined for numeric values, whereas `min_len !!! warning Bear in mind that these validators merely supplement NetBox's own validation: They will not override it. For example, if a certain model field is required by NetBox, setting a validator for it with `{'prohibited': True}` will not work. +### Validating Request Parameters + +!!! info "This feature was introduced in NetBox v4.0." + +In addition to validating object attributes, custom validators can also match against parameters of the current request (where available). For example, the following rule will permit only the user named "admin" to modify an object: + +```json +{ + "request.user.username": { + "eq": "admin" + } +} +``` + +!!! tip + Custom validation should generally not be used to enforce permissions. NetBox provides a robust [object-based permissions](../administration/permissions.md) mechanism which should be used for this purpose. + ### Custom Validation Logic -There may be instances where the provided validation types are insufficient. NetBox provides a `CustomValidator` class which can be extended to enforce arbitrary validation logic by overriding its `validate()` method, and calling `fail()` when an unsatisfactory condition is detected. +There may be instances where the provided validation types are insufficient. NetBox provides a `CustomValidator` class which can be extended to enforce arbitrary validation logic by overriding its `validate()` method, and calling `fail()` when an unsatisfactory condition is detected. The `validate()` method should accept an instance (the object being saved) as well as the current request effecting the change. ```python from extras.validators import CustomValidator class MyValidator(CustomValidator): - def validate(self, instance): + def validate(self, instance, request): if instance.status == 'active' and not instance.description: self.fail("Active sites must have a description set!", field='status') ``` diff --git a/docs/plugins/development/navigation.md b/docs/plugins/development/navigation.md index dc895b2ab..45d02f805 100644 --- a/docs/plugins/development/navigation.md +++ b/docs/plugins/development/navigation.md @@ -49,8 +49,8 @@ menu_items = (item1, item2, item3) Each menu item represents a link and (optionally) a set of buttons comprising one entry in NetBox's navigation menu. Menu items are defined as PluginMenuItem instances. An example is shown below. ```python title="navigation.py" +from netbox.choices import ButtonColorChoices from netbox.plugins import PluginMenuButton, PluginMenuItem -from utilities.choices import ButtonColorChoices item1 = PluginMenuItem( link='plugins:myplugin:myview', diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 0c01d6eb9..54f875975 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -6,7 +6,7 @@ from dcim.views import PathTraceView from netbox.views import generic from tenancy.views import ObjectContactsView from utilities.forms import ConfirmationForm -from utilities.utils import count_related +from utilities.query import count_related from utilities.views import register_model_view from . import filtersets, forms, tables from .models import * diff --git a/netbox/core/models/data.py b/netbox/core/models/data.py index 4ceb22ba9..48fa2ff71 100644 --- a/netbox/core/models/data.py +++ b/netbox/core/models/data.py @@ -1,3 +1,4 @@ +import hashlib import logging import os import yaml @@ -18,7 +19,6 @@ from netbox.constants import CENSOR_TOKEN, CENSOR_TOKEN_CHANGED from netbox.models import PrimaryModel from netbox.models.features import JobsMixin from netbox.registry import registry -from utilities.files import sha256_hash from utilities.querysets import RestrictedQuerySet from ..choices import * from ..exceptions import SyncError @@ -357,7 +357,8 @@ class DataFile(models.Model): has changed. """ file_path = os.path.join(source_root, self.path) - file_hash = sha256_hash(file_path).hexdigest() + with open(file_path, 'rb') as f: + file_hash = hashlib.sha256(f.read()).hexdigest() # Update instance file attributes & data if is_modified := file_hash != self.hash: diff --git a/netbox/core/views.py b/netbox/core/views.py index 0379900e1..400b421d5 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -25,7 +25,7 @@ from netbox.views import generic from netbox.views.generic.base import BaseObjectView from netbox.views.generic.mixins import TableMixin from utilities.forms import ConfirmationForm -from utilities.utils import count_related +from utilities.query import count_related from utilities.views import ContentTypePermissionRequiredMixin, register_model_view from . import filtersets, forms, tables from .models import * diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 2ff9f49ae..ad1e29f26 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -10,12 +10,12 @@ from extras.filtersets import LocalConfigContextFilterSet from extras.models import ConfigTemplate from ipam.filtersets import PrimaryIPFilterSet from ipam.models import ASN, IPAddress, VRF +from netbox.choices import ColorChoices from netbox.filtersets import ( BaseFilterSet, ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, NetBoxModelFilterSet, ) from tenancy.filtersets import TenancyFilterSet, ContactModelFilterSet from tenancy.models import * -from utilities.choices import ColorChoices from utilities.filters import ( ContentTypeFilter, MultiValueCharFilter, MultiValueMACAddressFilter, MultiValueNumberFilter, MultiValueWWNFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter, diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index f8a61a794..64f0b8560 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -15,9 +15,9 @@ from dcim.constants import * from dcim.fields import PathField from dcim.utils import decompile_path_node, object_to_path_node from netbox.models import ChangeLoggedModel, PrimaryModel +from utilities.conversion import to_meters from utilities.fields import ColorField from utilities.querysets import RestrictedQuerySet -from utilities.utils import to_meters from wireless.models import WirelessLink from .device_components import FrontPort, RearPort, PathEndpoint diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 5b2564b32..9438b741f 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -12,8 +12,8 @@ from mptt.models import MPTTModel, TreeForeignKey from dcim.choices import * from dcim.constants import * from dcim.fields import MACAddressField, WWNField +from netbox.choices import ColorChoices from netbox.models import OrganizationalModel, NetBoxModel -from utilities.choices import ColorChoices from utilities.fields import ColorField, NaturalOrderingField from utilities.mptt import TreeManager from utilities.ordering import naturalize_interface diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 4f221fe16..10792e387 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -18,10 +18,10 @@ from dcim.choices import * from dcim.constants import * from extras.models import ConfigContextModel, CustomField from extras.querysets import ConfigContextModelQuerySet +from netbox.choices import ColorChoices from netbox.config import ConfigItem from netbox.models import OrganizationalModel, PrimaryModel from netbox.models.features import ContactsMixin, ImageAttachmentsMixin -from utilities.choices import ColorChoices from utilities.fields import ColorField, CounterCacheField, NaturalOrderingField from utilities.tracking import TrackingModelMixin from .device_components import * diff --git a/netbox/dcim/models/mixins.py b/netbox/dcim/models/mixins.py index 9be8dc0a3..d4a05699c 100644 --- a/netbox/dcim/models/mixins.py +++ b/netbox/dcim/models/mixins.py @@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils.translation import gettext_lazy as _ from dcim.choices import * -from utilities.utils import to_grams +from utilities.conversion import to_grams __all__ = ( 'RenderConfigMixin', diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 3cb4e0225..289c38133 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -14,11 +14,12 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import * from dcim.constants import * from dcim.svg import RackElevationSVG +from netbox.choices import ColorChoices from netbox.models import OrganizationalModel, PrimaryModel from netbox.models.features import ContactsMixin, ImageAttachmentsMixin -from utilities.choices import ColorChoices +from utilities.conversion import to_grams +from utilities.data import array_to_string, drange from utilities.fields import ColorField, NaturalOrderingField -from utilities.utils import array_to_string, drange, to_grams from .device_components import PowerPort from .devices import Device, Module from .mixins import WeightMixin diff --git a/netbox/dcim/svg/cables.py b/netbox/dcim/svg/cables.py index d7365161e..aaa9e24ed 100644 --- a/netbox/dcim/svg/cables.py +++ b/netbox/dcim/svg/cables.py @@ -6,7 +6,7 @@ from svgwrite.text import Text from django.conf import settings from dcim.constants import CABLE_TRACE_SVG_DEFAULT_WIDTH -from utilities.utils import foreground_color +from utilities.html import foreground_color __all__ = ( diff --git a/netbox/dcim/svg/racks.py b/netbox/dcim/svg/racks.py index 07ea55a33..0f73095b5 100644 --- a/netbox/dcim/svg/racks.py +++ b/netbox/dcim/svg/racks.py @@ -14,7 +14,8 @@ from django.urls import reverse from django.utils.http import urlencode from netbox.config import get_config -from utilities.utils import foreground_color, array_to_ranges +from utilities.data import array_to_ranges +from utilities.html import foreground_color from dcim.constants import RACK_ELEVATION_BORDER_WIDTH diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index fffa82a10..96ea020b3 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -6,13 +6,12 @@ from dcim.choices import * from dcim.filtersets import * from dcim.models import * from ipam.models import ASN, IPAddress, RIR, VRF +from netbox.choices import ColorChoices from tenancy.models import Tenant, TenantGroup -from utilities.choices import ColorChoices from utilities.testing import ChangeLoggedFilterSetTests, create_test_device from virtualization.models import Cluster, ClusterType from wireless.choices import WirelessChannelChoices, WirelessRoleChoices - User = get_user_model() diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 1a5cc8435..cab1760ed 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -7,7 +7,7 @@ from dcim.choices import * from dcim.models import * from extras.models import CustomField from tenancy.models import Tenant -from utilities.utils import drange +from utilities.data import drange class LocationTestCase(TestCase): diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index e3437cefc..ec85fc1d5 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -11,12 +11,11 @@ from dcim.choices import * from dcim.constants import * from dcim.models import * from ipam.models import ASN, RIR, VLAN, VRF +from netbox.choices import CSVDelimiterChoices, ImportFormatChoices from tenancy.models import Tenant -from utilities.choices import CSVDelimiterChoices, ImportFormatChoices from utilities.testing import ViewTestCases, create_tags, create_test_device, post_data from wireless.models import WirelessLAN - User = get_user_model() diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 49bbe9be1..120bbcb59 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -25,8 +25,8 @@ from tenancy.views import ObjectContactsView from utilities.forms import ConfirmationForm from utilities.paginator import EnhancedPaginator, get_paginate_count from utilities.permissions import get_permission_for_model +from utilities.query import count_related from utilities.query_functions import CollateAsChar -from utilities.utils import count_related from utilities.views import GetReturnURLMixin, ObjectPermissionRequiredMixin, ViewTab, register_model_view from virtualization.models import VirtualMachine from . import filtersets, forms, tables diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 3439f6f3f..0a5303741 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -20,7 +20,7 @@ from netbox.api.metadata import ContentTypeMetadata from netbox.api.renderers import TextRenderer from netbox.api.viewsets import NetBoxModelViewSet from utilities.exceptions import RQWorkerNotRunningException -from utilities.utils import copy_safe_request +from utilities.request import copy_safe_request from . import serializers from .mixins import ConfigTemplateRenderMixin diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index d4b41aba9..2c9d5836a 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -2,7 +2,8 @@ import logging from django.utils.translation import gettext_lazy as _ -from utilities.choices import ButtonColorChoices, ChoiceSet +from netbox.choices import ButtonColorChoices +from utilities.choices import ChoiceSet # diff --git a/netbox/extras/dashboard/widgets.py b/netbox/extras/dashboard/widgets.py index 69bef0d8f..23f082ce2 100644 --- a/netbox/extras/dashboard/widgets.py +++ b/netbox/extras/dashboard/widgets.py @@ -14,10 +14,12 @@ from django.utils.translation import gettext as _ from core.models import ObjectType from extras.choices import BookmarkOrderingChoices -from utilities.choices import ButtonColorChoices +from netbox.choices import ButtonColorChoices +from utilities.object_types import object_type_identifier, object_type_name from utilities.permissions import get_permission_for_model +from utilities.querydict import dict_to_querydict from utilities.templatetags.builtins.filters import render_markdown -from utilities.utils import content_type_identifier, content_type_name, dict_to_querydict, get_viewname +from utilities.views import get_viewname from .utils import register_widget __all__ = ( @@ -33,15 +35,15 @@ __all__ = ( def get_object_type_choices(): return [ - (content_type_identifier(ct), content_type_name(ct)) - for ct in ObjectType.objects.public().order_by('app_label', 'model') + (object_type_identifier(ot), object_type_name(ot)) + for ot in ObjectType.objects.public().order_by('app_label', 'model') ] def get_bookmarks_object_type_choices(): return [ - (content_type_identifier(ct), content_type_name(ct)) - for ct in ObjectType.objects.with_feature('bookmarks').order_by('app_label', 'model') + (object_type_identifier(ot), object_type_name(ot)) + for ot in ObjectType.objects.with_feature('bookmarks').order_by('app_label', 'model') ] diff --git a/netbox/extras/events.py b/netbox/extras/events.py index 0ee4cffa8..a33ac213c 100644 --- a/netbox/extras/events.py +++ b/netbox/extras/events.py @@ -1,9 +1,6 @@ -import logging - from django.conf import settings from django.contrib.auth import get_user_model from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ObjectDoesNotExist from django.utils import timezone from django.utils.module_loading import import_string from django.utils.translation import gettext as _ @@ -15,9 +12,9 @@ from netbox.constants import RQ_QUEUE_DEFAULT from netbox.registry import registry from utilities.api import get_serializer_for_model from utilities.rqworker import get_rq_retry -from utilities.utils import serialize_object +from utilities.serialization import serialize_object from .choices import * -from .models import EventRule, ScriptModule +from .models import EventRule logger = logging.getLogger('netbox.events_processor') diff --git a/netbox/extras/forms/reports.py b/netbox/extras/forms/reports.py index ad37eb744..358ee90e3 100644 --- a/netbox/extras/forms/reports.py +++ b/netbox/extras/forms/reports.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _ from extras.choices import DurationChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions -from utilities.utils import local_now +from utilities.datetime import local_now __all__ = ( 'ReportForm', diff --git a/netbox/extras/forms/scripts.py b/netbox/extras/forms/scripts.py index f67ad3e75..ece96f5e4 100644 --- a/netbox/extras/forms/scripts.py +++ b/netbox/extras/forms/scripts.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _ from extras.choices import DurationChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions -from utilities.utils import local_now +from utilities.datetime import local_now __all__ = ( 'ScriptForm', diff --git a/netbox/extras/management/commands/runscript.py b/netbox/extras/management/commands/runscript.py index 2098b7a82..160e8813f 100644 --- a/netbox/extras/management/commands/runscript.py +++ b/netbox/extras/management/commands/runscript.py @@ -14,7 +14,7 @@ from extras.context_managers import event_tracking from extras.scripts import get_module_and_script from extras.signals import clear_events from utilities.exceptions import AbortTransaction -from utilities.utils import NetBoxFakeRequest +from utilities.request import NetBoxFakeRequest class Command(BaseCommand): diff --git a/netbox/extras/models/configs.py b/netbox/extras/models/configs.py index ff39c3e8b..6b52d4c02 100644 --- a/netbox/extras/models/configs.py +++ b/netbox/extras/models/configs.py @@ -9,11 +9,11 @@ from jinja2.sandbox import SandboxedEnvironment from extras.querysets import ConfigContextQuerySet from netbox.config import get_config -from netbox.registry import registry from netbox.models import ChangeLoggedModel from netbox.models.features import CloningMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin -from utilities.jinja2 import ConfigTemplateLoader -from utilities.utils import deepmerge +from netbox.registry import registry +from utilities.data import deepmerge +from utilities.jinja2 import DataFileLoader __all__ = ( 'ConfigContext', @@ -290,7 +290,7 @@ class ConfigTemplate(SyncedDataMixin, CustomLinksMixin, ExportTemplatesMixin, Ta """ # Initialize the template loader & cache the base template code (if applicable) if self.data_file: - loader = ConfigTemplateLoader(data_source=self.data_source) + loader = DataFileLoader(data_source=self.data_source) loader.cache_templates({ self.data_file.path: self.template_code }) diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index b55aaa11d..16f10b485 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -22,8 +22,10 @@ from netbox.models import ChangeLoggedModel from netbox.models.features import ( CloningMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, SyncedDataMixin, TagsMixin, ) +from utilities.html import clean_html +from utilities.querydict import dict_to_querydict from utilities.querysets import RestrictedQuerySet -from utilities.utils import clean_html, dict_to_querydict, render_jinja2 +from utilities.jinja2 import render_jinja2 __all__ = ( 'Bookmark', diff --git a/netbox/extras/models/search.py b/netbox/extras/models/search.py index 3c2cebe8e..ae99f1735 100644 --- a/netbox/extras/models/search.py +++ b/netbox/extras/models/search.py @@ -4,9 +4,7 @@ from django.db import models from django.utils.translation import gettext_lazy as _ from netbox.search.utils import get_indexer -from netbox.registry import registry from utilities.fields import RestrictedGenericForeignKey -from utilities.utils import content_type_identifier from ..fields import CachedValueField __all__ = ( diff --git a/netbox/extras/models/staging.py b/netbox/extras/models/staging.py index f15d8d470..6e381ce70 100644 --- a/netbox/extras/models/staging.py +++ b/netbox/extras/models/staging.py @@ -8,7 +8,7 @@ from django.utils.translation import gettext_lazy as _ from extras.choices import ChangeActionChoices from netbox.models import ChangeLoggedModel from netbox.models.features import * -from utilities.utils import deserialize_object +from utilities.serialization import deserialize_object __all__ = ( 'Branch', diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py index 27b05638e..6af0d41c8 100644 --- a/netbox/extras/models/tags.py +++ b/netbox/extras/models/tags.py @@ -5,9 +5,9 @@ from django.utils.text import slugify from django.utils.translation import gettext_lazy as _ from taggit.models import TagBase, GenericTaggedItemBase +from netbox.choices import ColorChoices from netbox.models import ChangeLoggedModel from netbox.models.features import CloningMixin, ExportTemplatesMixin -from utilities.choices import ColorChoices from utilities.fields import ColorField __all__ = ( diff --git a/netbox/extras/signals.py b/netbox/extras/signals.py index 833ce0036..2813ed7ae 100644 --- a/netbox/extras/signals.py +++ b/netbox/extras/signals.py @@ -1,7 +1,8 @@ +import importlib import logging from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ValidationError +from django.core.exceptions import ImproperlyConfigured, ValidationError from django.db.models.fields.reverse_related import ManyToManyRel from django.db.models.signals import m2m_changed, post_save, pre_delete from django.dispatch import receiver, Signal @@ -13,7 +14,6 @@ from core.signals import job_end, job_start from extras.constants import EVENT_JOB_END, EVENT_JOB_START from extras.events import process_event_rules from extras.models import EventRule -from extras.validators import run_validators from netbox.config import get_config from netbox.context import current_request, events_queue from netbox.models.features import ChangeLoggingMixin @@ -22,6 +22,30 @@ from utilities.exceptions import AbortRequest from .choices import ObjectChangeActionChoices from .events import enqueue_object, get_snapshots, serialize_for_event from .models import CustomField, ObjectChange, TaggedItem +from .validators import CustomValidator + + +def run_validators(instance, validators): + """ + Run the provided iterable of validators for the instance. + """ + request = current_request.get() + for validator in validators: + + # Loading a validator class by dotted path + if type(validator) is str: + module, cls = validator.rsplit('.', 1) + validator = getattr(importlib.import_module(module), cls)() + + # Constructing a new instance on the fly from a ruleset + elif type(validator) is dict: + validator = CustomValidator(validator) + + elif not issubclass(validator.__class__, CustomValidator): + raise ImproperlyConfigured(f"Invalid value for custom validator: {validator}") + + validator(instance, request) + # # Change logging/webhooks diff --git a/netbox/extras/tests/test_custom_validation.py b/netbox/extras/tests/test_custom_validation.py index e375b49f5..652bc241b 100644 --- a/netbox/extras/tests/test_custom_validation.py +++ b/netbox/extras/tests/test_custom_validation.py @@ -5,7 +5,7 @@ from circuits.api.serializers import ProviderSerializer from circuits.forms import ProviderForm from circuits.models import Provider from ipam.models import ASN, RIR -from utilities.choices import CSVDelimiterChoices, ImportFormatChoices +from netbox.choices import CSVDelimiterChoices, ImportFormatChoices from utilities.testing import APITestCase, ModelViewTestCase, create_tags, post_data diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index 0c8b86f93..d4917cde9 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -12,7 +12,7 @@ from dcim.models import Manufacturer, Rack, Site from extras.choices import * from extras.models import CustomField, CustomFieldChoiceSet from ipam.models import VLAN -from utilities.choices import CSVDelimiterChoices, ImportFormatChoices +from netbox.choices import CSVDelimiterChoices, ImportFormatChoices from utilities.testing import APITestCase, TestCase from virtualization.models import VirtualMachine diff --git a/netbox/extras/tests/test_customvalidation.py b/netbox/extras/tests/test_customvalidation.py index d74ad599b..7dca8a270 100644 --- a/netbox/extras/tests/test_customvalidation.py +++ b/netbox/extras/tests/test_customvalidation.py @@ -3,11 +3,13 @@ from django.core.exceptions import ValidationError from django.db import transaction from django.test import TestCase, override_settings -from ipam.models import ASN, RIR from dcim.choices import SiteStatusChoices from dcim.models import Site from extras.validators import CustomValidator +from ipam.models import ASN, RIR +from users.models import User from utilities.exceptions import AbortRequest +from utilities.request import NetBoxFakeRequest class MyValidator(CustomValidator): @@ -79,6 +81,13 @@ prohibited_validator = CustomValidator({ } }) + +request_validator = CustomValidator({ + 'request.user.username': { + 'eq': 'Bob' + } +}) + custom_validator = MyValidator() @@ -154,6 +163,28 @@ class CustomValidatorTest(TestCase): def test_custom_valid(self): Site(name='foo', slug='foo').clean() + @override_settings(CUSTOM_VALIDATORS={'dcim.site': [request_validator]}) + def test_request_validation(self): + alice = User.objects.create(username='Alice') + bob = User.objects.create(username='Bob') + request = NetBoxFakeRequest({ + 'META': {}, + 'POST': {}, + 'GET': {}, + 'FILES': {}, + 'user': alice, + 'path': '', + }) + site = Site(name='abc', slug='abc') + + # Attempt to create the Site as Alice + with self.assertRaises(ValidationError): + request_validator(site, request) + + # Creating the Site as Bob should succeed + request.user = bob + request_validator(site, request) + class CustomValidatorConfigTest(TestCase): diff --git a/netbox/extras/validators.py b/netbox/extras/validators.py index 30c9397d5..8d91ca66b 100644 --- a/netbox/extras/validators.py +++ b/netbox/extras/validators.py @@ -1,4 +1,5 @@ -import importlib +import inspect +import operator from django.core import validators from django.core.exceptions import ValidationError @@ -74,6 +75,8 @@ class CustomValidator: :param validation_rules: A dictionary mapping object attributes to validation rules """ + REQUEST_TOKEN = 'request' + VALIDATORS = { 'eq': IsEqualValidator, 'neq': IsNotEqualValidator, @@ -88,25 +91,56 @@ class CustomValidator: def __init__(self, validation_rules=None): self.validation_rules = validation_rules or {} - assert type(self.validation_rules) is dict, "Validation rules must be passed as a dictionary" + if type(self.validation_rules) is not dict: + raise ValueError(_("Validation rules must be passed as a dictionary")) - def __call__(self, instance): - # Validate instance attributes per validation rules - for attr_name, rules in self.validation_rules.items(): - attr = self._getattr(instance, attr_name) + def __call__(self, instance, request=None): + """ + Validate the instance and (optional) request against the validation rule(s). + """ + for attr_path, rules in self.validation_rules.items(): + + # The rule applies to the current request + if attr_path.split('.')[0] == self.REQUEST_TOKEN: + # Skip if no request has been provided (we can't validate) + if request is None: + continue + attr = self._get_request_attr(request, attr_path) + # The rule applies to the instance + else: + attr = self._get_instance_attr(instance, attr_path) + + # Validate the attribute's value against each of the rules defined for it for descriptor, value in rules.items(): validator = self.get_validator(descriptor, value) try: validator(attr) except ValidationError as exc: - # Re-package the raised ValidationError to associate it with the specific attr - raise ValidationError({attr_name: exc}) + raise ValidationError( + _("Custom validation failed for {attribute}: {exception}").format( + attribute=attr_path, exception=exc + ) + ) # Execute custom validation logic (if any) - self.validate(instance) + # TODO: Remove in v4.1 + # Inspect the validate() method, which may have been overridden, to determine + # whether we should pass the request (maintains backward compatibility for pre-v4.0) + if 'request' in inspect.signature(self.validate).parameters: + self.validate(instance, request) + else: + self.validate(instance) @staticmethod - def _getattr(instance, name): + def _get_request_attr(request, name): + name = name.split('.', maxsplit=1)[1] # Remove token + try: + return operator.attrgetter(name)(request) + except AttributeError: + raise ValidationError(_('Invalid attribute "{name}" for request').format(name=name)) + + @staticmethod + def _get_instance_attr(instance, name): # Attempt to resolve many-to-many fields to their stored values m2m_fields = [f.name for f in instance._meta.local_many_to_many] if name in m2m_fields: @@ -137,7 +171,7 @@ class CustomValidator: validator_cls = self.VALIDATORS.get(descriptor) return validator_cls(value) - def validate(self, instance): + def validate(self, instance, request): """ Custom validation method, to be overridden by the user. Validation failures should raise a ValidationError exception. @@ -151,21 +185,3 @@ class CustomValidator: if field is not None: raise ValidationError({field: message}) raise ValidationError(message) - - -def run_validators(instance, validators): - """ - Run the provided iterable of validators for the instance. - """ - for validator in validators: - - # Loading a validator class by dotted path - if type(validator) is str: - module, cls = validator.rsplit('.', 1) - validator = getattr(importlib.import_module(module), cls)() - - # Constructing a new instance on the fly from a ruleset - elif type(validator) is dict: - validator = CustomValidator(validator) - - validator(instance) diff --git a/netbox/extras/views.py b/netbox/extras/views.py index cb3fdd39c..2468e9236 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -18,12 +18,15 @@ from extras.dashboard.utils import get_widget_class from netbox.constants import DEFAULT_ACTION_PERMISSIONS from netbox.views import generic from netbox.views.generic.mixins import TableMixin +from utilities.data import shallow_compare_dict from utilities.forms import ConfirmationForm, get_field_value from utilities.paginator import EnhancedPaginator, get_paginate_count +from utilities.query import count_related +from utilities.querydict import normalize_querydict +from utilities.request import copy_safe_request from utilities.rqworker import get_workers_for_queue from utilities.templatetags.builtins.filters import render_markdown -from utilities.utils import copy_safe_request, count_related, get_viewname, normalize_querydict, shallow_compare_dict -from utilities.views import ContentTypePermissionRequiredMixin, register_model_view +from utilities.views import ContentTypePermissionRequiredMixin, get_viewname, register_model_view from . import filtersets, forms, tables from .models import * from .scripts import run_script diff --git a/netbox/ipam/models/services.py b/netbox/ipam/models/services.py index 3e3261ee9..37b559801 100644 --- a/netbox/ipam/models/services.py +++ b/netbox/ipam/models/services.py @@ -8,8 +8,7 @@ from django.utils.translation import gettext_lazy as _ from ipam.choices import * from ipam.constants import * from netbox.models import PrimaryModel -from utilities.utils import array_to_string - +from utilities.data import array_to_string __all__ = ( 'Service', diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py index 2ff8a8b6e..a3f37fe3c 100644 --- a/netbox/ipam/querysets.py +++ b/netbox/ipam/querysets.py @@ -3,8 +3,8 @@ from django.db.models import Count, F, OuterRef, Q, Subquery, Value from django.db.models.expressions import RawSQL from django.db.models.functions import Round +from utilities.query import count_related from utilities.querysets import RestrictedQuerySet -from utilities.utils import count_related __all__ = ( 'ASNRangeQuerySet', diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 6870d1e9e..24d82d186 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -9,8 +9,8 @@ from circuits.models import Provider from dcim.filtersets import InterfaceFilterSet from dcim.models import Interface, Site from netbox.views import generic +from utilities.query import count_related from utilities.tables import get_table_ordering -from utilities.utils import count_related from utilities.views import ViewTab, register_model_view from virtualization.filtersets import VMInterfaceFilterSet from virtualization.models import VMInterface diff --git a/netbox/netbox/api/serializers/generic.py b/netbox/netbox/api/serializers/generic.py index fb4fab8b0..b1cf40406 100644 --- a/netbox/netbox/api/serializers/generic.py +++ b/netbox/netbox/api/serializers/generic.py @@ -2,9 +2,10 @@ from django.contrib.contenttypes.models import ContentType from drf_spectacular.utils import extend_schema_field from rest_framework import serializers +from core.models import ObjectType from netbox.api.fields import ContentTypeField from utilities.api import get_serializer_for_model -from utilities.utils import content_type_identifier +from utilities.object_types import object_type_identifier __all__ = ( 'GenericObjectSerializer', @@ -27,9 +28,9 @@ class GenericObjectSerializer(serializers.Serializer): return model.objects.get(pk=data['object_id']) def to_representation(self, instance): - ct = ContentType.objects.get_for_model(instance) + object_type = ObjectType.objects.get_for_model(instance) data = { - 'object_type': content_type_identifier(ct), + 'object_type': object_type_identifier(object_type), 'object_id': instance.pk, } if 'request' in self.context: diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py index c70c68bc0..2b66639c8 100644 --- a/netbox/netbox/authentication.py +++ b/netbox/netbox/authentication.py @@ -12,7 +12,7 @@ from django.utils.translation import gettext_lazy as _ from users.constants import CONSTRAINT_TOKEN_USER from users.models import Group, ObjectPermission from utilities.permissions import ( - permission_is_exempt, qs_filter_from_constraints, resolve_permission, resolve_permission_ct, + permission_is_exempt, qs_filter_from_constraints, resolve_permission, resolve_permission_type, ) UserModel = get_user_model() @@ -284,11 +284,9 @@ class RemoteUserBackend(_RemoteUserBackend): permissions_list = [] for permission_name, constraints in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS.items(): try: - object_type, action = resolve_permission_ct( - permission_name) - # TODO: Merge multiple actions into a single ObjectPermission per content type - obj_perm = ObjectPermission( - actions=[action], constraints=constraints) + object_type, action = resolve_permission_type(permission_name) + # TODO: Merge multiple actions into a single ObjectPermission per object type + obj_perm = ObjectPermission(actions=[action], constraints=constraints) obj_perm.save() obj_perm.users.add(user) obj_perm.object_types.add(object_type) @@ -303,7 +301,9 @@ class RemoteUserBackend(_RemoteUserBackend): f"Assigned permissions to remotely-authenticated user {user}: {permissions_list}") else: logger.debug( - f"Skipped initial assignment of permissions and groups to remotely-authenticated user {user} as Group sync is enabled") + f"Skipped initial assignment of permissions and groups to remotely-authenticated user {user} as " + f"Group sync is enabled" + ) return user diff --git a/netbox/netbox/choices.py b/netbox/netbox/choices.py new file mode 100644 index 000000000..fe941056f --- /dev/null +++ b/netbox/netbox/choices.py @@ -0,0 +1,162 @@ +from django.utils.translation import gettext_lazy as _ + +from utilities.choices import ChoiceSet +from utilities.constants import CSV_DELIMITERS + +__all__ = ( + 'ButtonColorChoices', + 'ColorChoices', + 'CSVDelimiterChoices', + 'ImportFormatChoices', + 'ImportMethodChoices', +) + + +# +# Generic color choices +# + +class ColorChoices(ChoiceSet): + COLOR_DARK_RED = 'aa1409' + COLOR_RED = 'f44336' + COLOR_PINK = 'e91e63' + COLOR_ROSE = 'ffe4e1' + COLOR_FUCHSIA = 'ff66ff' + COLOR_PURPLE = '9c27b0' + COLOR_DARK_PURPLE = '673ab7' + COLOR_INDIGO = '3f51b5' + COLOR_BLUE = '2196f3' + COLOR_LIGHT_BLUE = '03a9f4' + COLOR_CYAN = '00bcd4' + COLOR_TEAL = '009688' + COLOR_AQUA = '00ffff' + COLOR_DARK_GREEN = '2f6a31' + COLOR_GREEN = '4caf50' + COLOR_LIGHT_GREEN = '8bc34a' + COLOR_LIME = 'cddc39' + COLOR_YELLOW = 'ffeb3b' + COLOR_AMBER = 'ffc107' + COLOR_ORANGE = 'ff9800' + COLOR_DARK_ORANGE = 'ff5722' + COLOR_BROWN = '795548' + COLOR_LIGHT_GREY = 'c0c0c0' + COLOR_GREY = '9e9e9e' + COLOR_DARK_GREY = '607d8b' + COLOR_BLACK = '111111' + COLOR_WHITE = 'ffffff' + + CHOICES = ( + (COLOR_DARK_RED, _('Dark Red')), + (COLOR_RED, _('Red')), + (COLOR_PINK, _('Pink')), + (COLOR_ROSE, _('Rose')), + (COLOR_FUCHSIA, _('Fuchsia')), + (COLOR_PURPLE, _('Purple')), + (COLOR_DARK_PURPLE, _('Dark Purple')), + (COLOR_INDIGO, _('Indigo')), + (COLOR_BLUE, _('Blue')), + (COLOR_LIGHT_BLUE, _('Light Blue')), + (COLOR_CYAN, _('Cyan')), + (COLOR_TEAL, _('Teal')), + (COLOR_AQUA, _('Aqua')), + (COLOR_DARK_GREEN, _('Dark Green')), + (COLOR_GREEN, _('Green')), + (COLOR_LIGHT_GREEN, _('Light Green')), + (COLOR_LIME, _('Lime')), + (COLOR_YELLOW, _('Yellow')), + (COLOR_AMBER, _('Amber')), + (COLOR_ORANGE, _('Orange')), + (COLOR_DARK_ORANGE, _('Dark Orange')), + (COLOR_BROWN, _('Brown')), + (COLOR_LIGHT_GREY, _('Light Grey')), + (COLOR_GREY, _('Grey')), + (COLOR_DARK_GREY, _('Dark Grey')), + (COLOR_BLACK, _('Black')), + (COLOR_WHITE, _('White')), + ) + + +# +# Button color choices +# + +class ButtonColorChoices(ChoiceSet): + """ + Map standard button color choices to Bootstrap 3 button classes + """ + DEFAULT = 'outline-dark' + BLUE = 'blue' + INDIGO = 'indigo' + PURPLE = 'purple' + PINK = 'pink' + RED = 'red' + ORANGE = 'orange' + YELLOW = 'yellow' + GREEN = 'green' + TEAL = 'teal' + CYAN = 'cyan' + GRAY = 'gray' + GREY = 'gray' # Backward compatability for <3.2 + BLACK = 'black' + WHITE = 'white' + + CHOICES = ( + (DEFAULT, _('Default')), + (BLUE, _('Blue')), + (INDIGO, _('Indigo')), + (PURPLE, _('Purple')), + (PINK, _('Pink')), + (RED, _('Red')), + (ORANGE, _('Orange')), + (YELLOW, _('Yellow')), + (GREEN, _('Green')), + (TEAL, _('Teal')), + (CYAN, _('Cyan')), + (GRAY, _('Gray')), + (BLACK, _('Black')), + (WHITE, _('White')), + ) + + +# +# Import Choices +# + +class ImportMethodChoices(ChoiceSet): + DIRECT = 'direct' + UPLOAD = 'upload' + DATA_FILE = 'datafile' + + CHOICES = [ + (DIRECT, _('Direct')), + (UPLOAD, _('Upload')), + (DATA_FILE, _('Data file')), + ] + + +class ImportFormatChoices(ChoiceSet): + AUTO = 'auto' + CSV = 'csv' + JSON = 'json' + YAML = 'yaml' + + CHOICES = [ + (AUTO, _('Auto-detect')), + (CSV, 'CSV'), + (JSON, 'JSON'), + (YAML, 'YAML'), + ] + + +class CSVDelimiterChoices(ChoiceSet): + AUTO = 'auto' + COMMA = CSV_DELIMITERS['comma'] + SEMICOLON = CSV_DELIMITERS['semicolon'] + TAB = CSV_DELIMITERS['tab'] + + CHOICES = [ + (AUTO, _('Auto-detect')), + (COMMA, _('Comma')), + (SEMICOLON, _('Semicolon')), + (TAB, _('Tab')), + ] diff --git a/netbox/netbox/middleware.py b/netbox/netbox/middleware.py index cb7d2c8ba..6e7da9ab0 100644 --- a/netbox/netbox/middleware.py +++ b/netbox/netbox/middleware.py @@ -13,7 +13,8 @@ from django.http import Http404, HttpResponseRedirect from extras.context_managers import event_tracking from netbox.config import clear_config, get_config from netbox.views import handler_500 -from utilities.api import is_api_request, rest_api_server_error +from utilities.api import is_api_request +from utilities.error_handlers import handle_rest_api_exception __all__ = ( 'CoreMiddleware', @@ -71,7 +72,7 @@ class CoreMiddleware: # Cleanly handle exceptions that occur from REST API requests if is_api_request(request): - return rest_api_server_error(request) + return handle_rest_api_exception(request) # Ignore Http404s (defer to Django's built-in 404 handling) if isinstance(exception, Http404): @@ -211,7 +212,7 @@ class MaintenanceModeMiddleware: 'operations. Please try again later.' if is_api_request(request): - return rest_api_server_error(request, error=error_message) + return handle_rest_api_exception(request, error=error_message) messages.error(request, error_message) return HttpResponseRedirect(request.path_info) diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py index bff9ee59f..000e717a4 100644 --- a/netbox/netbox/models/features.py +++ b/netbox/netbox/models/features.py @@ -17,7 +17,7 @@ from netbox.config import get_config from netbox.registry import registry from netbox.signals import post_clean from utilities.json import CustomFieldJSONEncoder -from utilities.utils import serialize_object +from utilities.serialization import serialize_object from utilities.views import register_model_view __all__ = ( diff --git a/netbox/netbox/navigation/__init__.py b/netbox/netbox/navigation/__init__.py index 63d2af9c1..d13282f7e 100644 --- a/netbox/netbox/navigation/__init__.py +++ b/netbox/netbox/navigation/__init__.py @@ -1,8 +1,6 @@ from dataclasses import dataclass from typing import Sequence, Optional -from utilities.choices import ButtonColorChoices - __all__ = ( 'get_model_item', diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py index 621bd4f5d..688c5a3ad 100644 --- a/netbox/netbox/navigation/menu.py +++ b/netbox/netbox/navigation/menu.py @@ -1,7 +1,6 @@ from django.utils.translation import gettext_lazy as _ from netbox.registry import registry -from utilities.choices import ButtonColorChoices from . import * # diff --git a/netbox/netbox/plugins/navigation.py b/netbox/netbox/plugins/navigation.py index aae569412..01b8a0442 100644 --- a/netbox/netbox/plugins/navigation.py +++ b/netbox/netbox/plugins/navigation.py @@ -1,8 +1,9 @@ -from netbox.navigation import MenuGroup -from utilities.choices import ButtonColorChoices from django.utils.text import slugify from django.utils.translation import gettext as _ +from netbox.choices import ButtonColorChoices +from netbox.navigation import MenuGroup + __all__ = ( 'PluginMenu', 'PluginMenuButton', diff --git a/netbox/netbox/search/backends.py b/netbox/netbox/search/backends.py index a9e867b9f..227a79205 100644 --- a/netbox/netbox/search/backends.py +++ b/netbox/netbox/search/backends.py @@ -14,8 +14,9 @@ from netaddr.core import AddrFormatError from core.models import ObjectType from extras.models import CachedValue, CustomField from netbox.registry import registry +from utilities.object_types import object_type_identifier from utilities.querysets import RestrictedPrefetch -from utilities.utils import content_type_identifier, title +from utilities.string import title from . import FieldTypes, LookupTypes, get_indexer DEFAULT_LOOKUP_TYPE = LookupTypes.PARTIAL @@ -156,7 +157,7 @@ class CachedValueSearchBackend(SearchBackend): # related objects necessary to render the prescribed display attributes (display_attrs). for object_type in object_types: model = object_type.model_class() - indexer = registry['search'].get(content_type_identifier(object_type)) + indexer = registry['search'].get(object_type_identifier(object_type)) if not (display_attrs := getattr(indexer, 'display_attrs', None)): continue diff --git a/netbox/netbox/search/utils.py b/netbox/netbox/search/utils.py index 824fbfb3d..9ae5edee5 100644 --- a/netbox/netbox/search/utils.py +++ b/netbox/netbox/search/utils.py @@ -1,14 +1,14 @@ from netbox.registry import registry -from utilities.utils import content_type_identifier +from utilities.object_types import object_type_identifier __all__ = ( 'get_indexer', ) -def get_indexer(content_type): +def get_indexer(object_type): """ Return the registered search indexer for the given ContentType. """ - ct_identifier = content_type_identifier(content_type) - return registry['search'].get(ct_identifier) + identifier = object_type_identifier(object_type) + return registry['search'].get(identifier) diff --git a/netbox/netbox/staging.py b/netbox/netbox/staging.py index ec38dcadc..4d37fb7ad 100644 --- a/netbox/netbox/staging.py +++ b/netbox/netbox/staging.py @@ -6,7 +6,7 @@ from django.db.models.signals import m2m_changed, pre_delete, post_save from extras.choices import ChangeActionChoices from extras.models import StagedChange -from utilities.utils import serialize_object +from utilities.serialization import serialize_object logger = logging.getLogger('netbox.staging') diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 442e5f260..193bf8a17 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -18,9 +18,10 @@ from django_tables2.columns import library from django_tables2.utils import Accessor from extras.choices import CustomFieldTypeChoices +from utilities.object_types import object_type_identifier, object_type_name from utilities.permissions import get_permission_for_model from utilities.templatetags.builtins.filters import render_markdown -from utilities.utils import content_type_identifier, content_type_name, get_viewname +from utilities.views import get_viewname __all__ = ( 'ActionsColumn', @@ -338,12 +339,12 @@ class ContentTypeColumn(tables.Column): def render(self, value): if value is None: return None - return content_type_name(value, include_app=False) + return object_type_name(value, include_app=False) def value(self, value): if value is None: return None - return content_type_identifier(value) + return object_type_identifier(value) class ContentTypesColumn(tables.ManyToManyColumn): @@ -357,11 +358,11 @@ class ContentTypesColumn(tables.ManyToManyColumn): super().__init__(separator=separator, *args, **kwargs) def transform(self, obj): - return content_type_name(obj, include_app=False) + return object_type_name(obj, include_app=False) def value(self, value): return ','.join([ - content_type_identifier(ct) for ct in self.filter(value) + object_type_identifier(ot) for ot in self.filter(value) ]) diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 31502f6c5..d8db511a2 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -17,7 +17,9 @@ from extras.models import CustomField, CustomLink from netbox.registry import registry from netbox.tables import columns from utilities.paginator import EnhancedPaginator, get_paginate_count -from utilities.utils import get_viewname, highlight_string, title +from utilities.html import highlight +from utilities.string import title +from utilities.views import get_viewname from .template_code import * __all__ = ( @@ -273,6 +275,6 @@ class SearchTable(tables.Table): if not self.highlight: return value - value = highlight_string(value, self.highlight, trim_pre=self.trim_length, trim_post=self.trim_length) + value = highlight(value, self.highlight, trim_pre=self.trim_length, trim_post=self.trim_length) return mark_safe(value) diff --git a/netbox/netbox/tests/test_import.py b/netbox/netbox/tests/test_import.py index b0b21a07d..f382d0112 100644 --- a/netbox/netbox/tests/test_import.py +++ b/netbox/netbox/tests/test_import.py @@ -2,8 +2,8 @@ from django.test import override_settings from core.models import ObjectType from dcim.models import * +from netbox.choices import CSVDelimiterChoices, ImportFormatChoices from users.models import ObjectPermission -from utilities.choices import CSVDelimiterChoices, ImportFormatChoices from utilities.testing import ModelViewTestCase, create_tags diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 022059e51..ba4e585ad 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -24,8 +24,7 @@ from utilities.exceptions import AbortRequest, AbortTransaction, PermissionsViol from utilities.forms import BulkRenameForm, ConfirmationForm, restrict_form_fields from utilities.forms.bulk_import import BulkImportForm from utilities.permissions import get_permission_for_model -from utilities.utils import get_viewname -from utilities.views import GetReturnURLMixin +from utilities.views import GetReturnURLMixin, get_viewname from .base import BaseMultiObjectView from .mixins import ActionsMixin, TableMixin from .utils import get_prerequisite_model diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 38c0ab488..26bd7de65 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -18,8 +18,8 @@ from utilities.error_handlers import handle_protectederror from utilities.exceptions import AbortRequest, PermissionsViolation from utilities.forms import ConfirmationForm, restrict_form_fields from utilities.permissions import get_permission_for_model -from utilities.utils import get_viewname, normalize_querydict, prepare_cloned_fields -from utilities.views import GetReturnURLMixin +from utilities.querydict import normalize_querydict, prepare_cloned_fields +from utilities.views import GetReturnURLMixin, get_viewname from .base import BaseObjectView from .mixins import ActionsMixin, TableMixin from .utils import get_prerequisite_model diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index fff12c1e8..071396575 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -41,7 +41,7 @@ Blocks: {# Top menu #}
-
+
{# Nav menu toggle #}