netbox-plugin-dns 1.2.4__py3-none-any.whl → 1.2.6__py3-none-any.whl

netbox_dns/__init__.py

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.2.4"
+__version__ = "1.2.6"
 
 
 def _check_list(setting):
@@ -64,6 +64,7 @@ class DNSConfig(PluginConfig):
         "enforce_unique_rrset_ttl": True,
         "menu_name": "DNS",
         "top_level_menu": True,
+        "convert_names_to_lowercase": False,
     }
     base_url = "netbox-dns"
 

netbox_dns/fields/__init__.py

@@ -2,3 +2,4 @@ from .network import *
 from .address import *
 from .rfc2317 import *
 from .ipam import *
+from .timeperiod import *

netbox_dns/fields/timeperiod.py

@@ -0,0 +1,31 @@
+from django.forms import Field
+from django.utils.dateparse import parse_duration
+from django.core.exceptions import ValidationError
+
+
+__all__ = ("TimePeriodField",)
+
+
+class TimePeriodField(Field):
+    def to_python(self, value):
+        if not value:
+            return None
+
+        try:
+            return int(value)
+        except ValueError:
+            try:
+                duration = parse_duration(value)
+                if duration is None:
+                    raise TypeError
+                return int(duration.total_seconds())
+            except TypeError:
+                raise ValidationError(
+                    "Enter a valid integer or ISO 8601 duration (W, M and Y are not supported)"
+                )
+
+    def validate(self, value):
+        super().validate(value)
+
+        if value is not None and value < 0:
+            raise ValidationError("A time period cannot be negative.")

netbox_dns/forms/record.py

@@ -23,6 +23,7 @@ from tenancy.forms import TenancyForm, TenancyFilterForm
 from netbox_dns.models import View, Zone, Record
 from netbox_dns.choices import RecordSelectableTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
+from netbox_dns.fields import TimePeriodField
 
 
 __all__ = (
@@ -67,7 +68,7 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Disable PTR"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -112,16 +113,17 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
+            "name",
             "view_id",
             "zone_id",
-            "name",
             "fqdn",
             "type",
             "value",
-            "disable_ptr",
             "status",
-            "active",
+            "ttl",
+            "disable_ptr",
             "description",
+            "active",
             name=_("Attributes"),
         ),
         FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
@@ -154,6 +156,10 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    ttl = TimePeriodField(
+        required=False,
+        label=_("TTL"),
+    )
     view_id = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
         required=False,
@@ -224,7 +230,7 @@ class RecordImportForm(NetBoxModelImportForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -286,7 +292,7 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )

netbox_dns/forms/record_template.py

@@ -23,6 +23,7 @@ from tenancy.forms import TenancyForm, TenancyFilterForm
 from netbox_dns.models import RecordTemplate, ZoneTemplate
 from netbox_dns.choices import RecordSelectableTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
+from netbox_dns.fields import TimePeriodField
 
 
 __all__ = (
@@ -50,7 +51,7 @@ class RecordTemplateForm(TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Disable PTR"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -99,6 +100,7 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "type",
             "value",
             "status",
+            "ttl",
             "disable_ptr",
             "description",
             name=_("Attributes"),
@@ -129,6 +131,10 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    ttl = TimePeriodField(
+        required=False,
+        label=_("TTL"),
+    )
     disable_ptr = forms.NullBooleanField(
         required=False,
         label=_("Disable PTR"),
@@ -156,7 +162,7 @@ class RecordTemplateImportForm(NetBoxModelImportForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -191,6 +197,10 @@ class RecordTemplateImportForm(NetBoxModelImportForm):
 class RecordTemplateBulkEditForm(NetBoxModelBulkEditForm):
     model = RecordTemplate
 
+    record_name = forms.CharField(
+        required=False,
+        label=_("Record Name"),
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(RecordSelectableTypeChoices),
         required=False,
@@ -205,7 +215,7 @@ class RecordTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )

netbox_dns/forms/zone.py

@@ -1,3 +1,5 @@
+from packaging.version import Version
+
 from django import forms
 from django.db import transaction
 from django.conf import settings
@@ -20,6 +22,7 @@ from utilities.forms.fields import (
     CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
 )
+from utilities.release import load_release_data
 from utilities.forms.widgets import BulkEditNullBooleanSelect
 from utilities.forms.rendering import FieldSet
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
@@ -36,7 +39,7 @@ from netbox_dns.models import (
 )
 from netbox_dns.choices import ZoneStatusChoices
 from netbox_dns.utilities import name_to_unicode, network_to_reverse
-from netbox_dns.fields import RFC2317NetworkFormField
+from netbox_dns.fields import RFC2317NetworkFormField, TimePeriodField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
 
 
@@ -47,6 +50,8 @@ __all__ = (
     "ZoneBulkEditForm",
 )
 
+QUICK_ADD = Version(load_release_data().version) >= Version("4.2.5")
+
 
 class RollbackTransaction(Exception):
     pass
@@ -140,6 +145,12 @@ class ZoneTemplateUpdateMixin:
 
 
 class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
+    view = DynamicModelChoiceField(
+        queryset=View.objects.all(),
+        required=True,
+        label=_("View"),
+        quick_add=QUICK_ADD,
+    )
     name = forms.CharField(
         required=True,
         label=_("Name"),
@@ -158,8 +169,9 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         queryset=NameServer.objects.all(),
         required=False,
         label=_("Nameservers"),
+        quick_add=QUICK_ADD,
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
         help_text=_("Default TTL for new records in this zone"),
         validators=[MinValueValidator(1)],
@@ -169,7 +181,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Description"),
     )
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=True,
         help_text=_("TTL for the SOA record of the zone"),
         validators=[MinValueValidator(1)],
@@ -180,31 +192,32 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         help_text=_("Primary nameserver this zone"),
         required=False,
         label=_("SOA MName"),
+        quick_add=QUICK_ADD,
     )
     soa_rname = forms.CharField(
         required=False,
         help_text=_("Mailbox of the zone's administrator"),
         label=_("SOA RName"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=True,
         help_text=_("Refresh interval for secondary nameservers"),
         validators=[MinValueValidator(1)],
         label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=True,
         help_text=_("Retry interval for secondary nameservers"),
         validators=[MinValueValidator(1)],
         label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=True,
         validators=[MinValueValidator(1)],
         help_text=_("Expire time after which the zone is considered unavailable"),
         label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=True,
         help_text=_("Minimum TTL for negative results, e.g. NXRRSET, NXDOMAIN"),
         validators=[MinValueValidator(1)],
@@ -230,7 +243,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
     rfc2317_parent_managed = forms.BooleanField(
         required=False,
         help_text=_(
-            "IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS"
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
         ),
         label=_("RFC2317 Parent Managed"),
     )
@@ -517,11 +530,11 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("Nameservers"),
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
         label=_("Default TTL"),
     )
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=False,
         help_text=_("TTL for the SOA record of the zone"),
         label=_("SOA TTL"),
@@ -549,22 +562,22 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("SOA Serial"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=False,
         help_text=_("Refresh interval for secondary nameservers"),
         label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=False,
         help_text=_("Retry interval for secondary nameservers"),
         label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=False,
         help_text=_("Expire time after which the zone is considered unavailable"),
         label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=False,
         help_text=_("Minimum TTL for negative results, e.g. NXRRSET, NXDOMAIN"),
         label=_("SOA Minimum TTL"),
@@ -577,7 +590,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
     rfc2317_parent_managed = forms.BooleanField(
         required=False,
         help_text=_(
-            "IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS"
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
         ),
         label=_("RFC2317 Parent Managed"),
     )
@@ -713,7 +726,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Nameservers"),
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("Default TTL"),
@@ -723,7 +736,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Description"),
     )
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA TTL"),
@@ -747,22 +760,22 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         validators=[MinValueValidator(1), MaxValueValidator(4294967295)],
         label=_("SOA Serial"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Minimum TTL"),
@@ -777,7 +790,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         widget=BulkEditNullBooleanSelect(),
         help_text=_(
-            "IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS"
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
         ),
         label=_("RFC2317 Parent Managed"),
     )

netbox_dns/forms/zone_template.py

@@ -1,3 +1,5 @@
+from packaging.version import Version
+
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
@@ -7,6 +9,7 @@ from netbox.forms import (
     NetBoxModelImportForm,
     NetBoxModelForm,
 )
+from utilities.release import load_release_data
 from utilities.forms.fields import (
     DynamicModelMultipleChoiceField,
     TagFilterField,
@@ -34,20 +37,25 @@ __all__ = (
     "ZoneTemplateBulkEditForm",
 )
 
+QUICK_ADD = Version(load_release_data().version) >= Version("4.2.5")
+
 
 class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        quick_add=QUICK_ADD,
     )
     soa_mname = DynamicModelChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
         label=_("MName"),
+        quick_add=QUICK_ADD,
     )
     record_templates = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
+        quick_add=QUICK_ADD,
     )
 
     fieldsets = (

netbox_dns/migrations/0014_alter_unique_constraints_lowercase.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.1.6 on 2025-02-27 19:36
+
+import django.db.models.functions.text
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("extras", "0122_charfield_null_choices"),
+        ("netbox_dns", "0013_zonetemplate_soa_mname_zonetemplate_soa_rname"),
+        ("tenancy", "0017_natural_ordering"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="zone",
+            unique_together=set(),
+        ),
+        migrations.AlterField(
+            model_name="nameserver",
+            name="name",
+            field=models.CharField(db_collation="natural_sort", max_length=255),
+        ),
+        migrations.AddConstraint(
+            model_name="nameserver",
+            constraint=models.UniqueConstraint(
+                django.db.models.functions.text.Lower("name"),
+                name="name_unique_ci",
+                violation_error_message="There is already a nameserver with this name",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="zone",
+            constraint=models.UniqueConstraint(
+                django.db.models.functions.text.Lower("name"),
+                models.F("view"),
+                name="name_view_unique_ci",
+                violation_error_message="There is already a zone with the same name in this view",
+            ),
+        ),
+    ]

netbox_dns/models/nameserver.py

@@ -2,13 +2,15 @@ from dns import name as dns_name
 
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
-from django.db.models import Q
+from django.db.models import Q, UniqueConstraint
+from django.db.models.functions import Lower
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
 from netbox.models.features import ContactsMixin
+from netbox.plugins.utils import get_plugin_config
 
 from netbox_dns.utilities import (
     name_to_unicode,
@@ -29,7 +31,6 @@ __all__ = (
 class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         verbose_name=_("Name"),
-        unique=True,
         max_length=255,
         db_collation="natural_sort",
     )
@@ -59,6 +60,16 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         ordering = ("name",)
 
+        constraints = [
+            UniqueConstraint(
+                Lower("name"),
+                name="name_unique_ci",
+                violation_error_message=_(
+                    "There is already a nameserver with this name"
+                ),
+            ),
+        ]
+
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()
@@ -73,6 +84,12 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:nameserver", kwargs={"pk": self.pk})
 
+    def clean_fields(self, exclude=None):
+        if get_plugin_config("netbox_dns", "convert_names_to_lowercase", False):
+            self.name = self.name.lower()
+
+        super().clean_fields(exclude=exclude)
+
     def clean(self, *args, **kwargs):
         try:
             self.name = normalize_name(self.name)

netbox_dns/models/record.py

@@ -371,9 +371,11 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if ptr_zone.is_rfc2317_zone:
             ptr_name = self.rfc2317_ptr_name
         else:
-            ptr_name = dns_name.from_text(
-                ipaddress.ip_address(self.value).reverse_pointer
-            ).relativize(dns_name.from_text(ptr_zone.name))
+            ptr_name = (
+                dns_name.from_text(ipaddress.ip_address(self.value).reverse_pointer)
+                .relativize(dns_name.from_text(ptr_zone.name))
+                .to_text()
+            )
 
         ptr_value = self.fqdn
         ptr_record = self.ptr_record
@@ -440,12 +442,16 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     def update_rfc2317_cname_record(self, save_zone_serial=True):
         if self.zone.rfc2317_parent_managed:
-            cname_name = dns_name.from_text(
-                ipaddress.ip_address(self.ip_address).reverse_pointer
-            ).relativize(dns_name.from_text(self.zone.rfc2317_parent_zone.name))
+            cname_name = (
+                dns_name.from_text(
+                    ipaddress.ip_address(self.ip_address).reverse_pointer
+                )
+                .relativize(dns_name.from_text(self.zone.rfc2317_parent_zone.name))
+                .to_text()
+            )
 
             if self.rfc2317_cname_record is not None:
-                if self.rfc2317_cname_record.name == cname_name.to_text():
+                if self.rfc2317_cname_record.name == cname_name:
                     self.rfc2317_cname_record.zone = self.zone.rfc2317_parent_zone
                     self.rfc2317_cname_record.value = self.fqdn
                     self.rfc2317_cname_record.ttl = min_ttl(
@@ -613,7 +619,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             new_zone = self.zone
 
         records = new_zone.records.filter(
-            name=self.name,
+            name__iexact=self.name,
             type=self.type,
             value=self.value,
             status__in=RECORD_ACTIVE_STATUS_LIST,
@@ -770,9 +776,12 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             record.ttl = ttl
             record.save(update_fields=["ttl"], update_rrset_ttl=False)
 
-    def clean_fields(self, *args, **kwargs):
+    def clean_fields(self, exclude=None):
         self.type = self.type.upper()
-        super().clean_fields(*args, **kwargs)
+        if get_plugin_config("netbox_dns", "convert_names_to_lowercase", False):
+            self.name = self.name.lower()
+
+        super().clean_fields(exclude=exclude)
 
     def clean(self, *args, new_zone=None, **kwargs):
         self.validate_name(new_zone=new_zone)

netbox_dns/models/record_template.py

@@ -174,9 +174,12 @@ class RecordTemplate(NetBoxModel):
         if tags := self.tags.all():
             record.tags.set(tags)
 
-    def clean_fields(self, *args, **kwargs):
+    def clean_fields(self, exclude=None):
         self.type = self.type.upper()
-        super().clean_fields(*args, **kwargs)
+        if get_plugin_config("netbox_dns", "convert_names_to_lowercase", False):
+            self.record_name = self.record_name.lower()
+
+        super().clean_fields(exclude=exclude)
 
     def clean(self, *args, **kwargs):
         self.validate_name()

netbox_dns/models/zone.py

@@ -11,8 +11,8 @@ from django.core.validators import (
 )
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models, transaction
-from django.db.models import Q, Max, ExpressionWrapper, BooleanField
-from django.db.models.functions import Length
+from django.db.models import Q, Max, ExpressionWrapper, BooleanField, UniqueConstraint
+from django.db.models.functions import Length, Lower
 from django.db.models.signals import m2m_changed
 from django.urls import reverse
 from django.dispatch import receiver
@@ -36,6 +36,7 @@ from netbox_dns.utilities import (
     name_to_unicode,
     normalize_name,
     get_parent_zone_names,
+    regex_from_list,
     NameFormatError,
 )
 from netbox_dns.validators import (
@@ -282,10 +283,16 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             "view",
             "name",
         )
-        unique_together = (
-            "view",
-            "name",
-        )
+        constraints = [
+            UniqueConstraint(
+                Lower("name"),
+                "view",
+                name="name_view_unique_ci",
+                violation_error_message=_(
+                    "There is already a zone with the same name in this view"
+                ),
+            ),
+        ]
 
     def __str__(self):
         if self.name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
@@ -399,12 +406,14 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     @property
     def descendant_zones(self):
-        return self.view.zones.filter(name__endswith=f".{self.name}")
+        return self.view.zones.filter(name__iendswith=f".{self.name}")
 
     @property
     def parent_zone(self):
         try:
-            return self.view.zones.get(name=get_parent_zone_names(self.name)[-1])
+            return self.view.zones.get(
+                name__iexact=get_parent_zone_names(self.name)[-1]
+            )
         except (Zone.DoesNotExist, IndexError):
             return None
 
@@ -412,20 +421,24 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def ancestor_zones(self):
         return (
             self.view.zones.annotate(name_length=Length("name"))
-            .filter(name__in=get_parent_zone_names(self.name))
+            .filter(name__iregex=regex_from_list(get_parent_zone_names(self.name)))
             .order_by("name_length")
         )
 
     @property
     def delegation_records(self):
         descendant_zone_names = [
-            f"{name}." for name in self.descendant_zones.values_list("name", flat=True)
+            rf"{name}."
+            for name in (
+                name.lower()
+                for name in self.descendant_zones.values_list("name", flat=True)
+            )
         ]
 
         ns_records = (
             self.records.filter(type=RecordTypeChoices.NS)
-            .exclude(fqdn=self.fqdn)
-            .filter(fqdn__in=descendant_zone_names)
+            .exclude(fqdn__iexact=self.fqdn)
+            .filter(fqdn__iregex=regex_from_list(descendant_zone_names))
         )
         ns_values = [record.value_fqdn for record in ns_records]
 
@@ -663,6 +676,9 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def clean_fields(self, exclude=None):
         defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
 
+        if get_plugin_config("netbox_dns", "convert_names_to_lowercase", False):
+            self.name = self.name.lower()
+
         if self.view_id is None:
             self.view_id = View.get_default_view().pk
 

netbox_dns/utilities/conversions.py

@@ -14,6 +14,7 @@ __all__ = (
     "value_to_unicode",
     "normalize_name",
     "network_to_reverse",
+    "regex_from_list",
 )
 
 
@@ -106,3 +107,7 @@ def network_to_reverse(network):
 
     if labels:
         return ".".join(ip_network[0].reverse_dns.split(".")[-labels:])
+
+
+def regex_from_list(names):
+    return f"^({'|'.join(re.escape(name) for name in names)})$"

netbox_dns/utilities/dns.py

@@ -1,11 +1,10 @@
 from dns import name as dns_name
 
-
 __all__ = ("get_parent_zone_names",)
 
 
 def get_parent_zone_names(name, min_labels=1, include_self=False):
-    fqdn = dns_name.from_text(name)
+    fqdn = dns_name.from_text(name.lower())
     return [
         fqdn.split(i)[1].to_text().rstrip(".")
         for i in range(min_labels + 1, len(fqdn.labels) + include_self)

netbox_dns/utilities/ipam_dnssync.py

@@ -13,6 +13,7 @@ from ipam.models import IPAddress, Prefix
 from netbox_dns.choices import RecordStatusChoices
 
 from .dns import get_parent_zone_names
+from .conversions import regex_from_list
 
 
 __all__ = (
@@ -90,8 +91,10 @@ def get_zones(ip_address, view=None, old_zone=None):
 
     zones = Zone.objects.filter(
         view__in=views,
-        name__in=get_parent_zone_names(
-            ip_address.dns_name, min_labels=min_labels, include_self=True
+        name__iregex=regex_from_list(
+            get_parent_zone_names(
+                ip_address.dns_name, min_labels=min_labels, include_self=True
+            )
         ),
         active=True,
     )

netbox_dns/views/record.py

@@ -16,7 +16,11 @@ from netbox_dns.forms import (
 from netbox_dns.models import Record, Zone
 from netbox_dns.choices import RecordTypeChoices
 from netbox_dns.tables import RecordTable, ManagedRecordTable, RelatedRecordTable
-from netbox_dns.utilities import value_to_unicode, get_parent_zone_names
+from netbox_dns.utilities import (
+    value_to_unicode,
+    get_parent_zone_names,
+    regex_from_list,
+)
 
 
 __all__ = (
@@ -74,7 +78,9 @@ class RecordView(generic.ObjectView):
             )
 
         if instance.zone.view.zones.filter(
-            name__in=get_parent_zone_names(instance.value_fqdn, min_labels=1),
+            name__iregex=regex_from_list(
+                get_parent_zone_names(instance.value_fqdn, min_labels=1)
+            ),
             active=True,
         ).exists():
             raise (
@@ -97,7 +103,9 @@ class RecordView(generic.ObjectView):
         )
 
         parent_zones = instance.zone.view.zones.filter(
-            name__in=get_parent_zone_names(instance.fqdn, include_self=True),
+            name__iregex=regex_from_list(
+                get_parent_zone_names(instance.fqdn, include_self=True)
+            ),
         )
 
         for parent_zone in parent_zones:
@@ -148,10 +156,12 @@ class RecordView(generic.ObjectView):
 
                 if Zone.objects.filter(
                     active=True,
-                    name__in=get_parent_zone_names(
-                        instance.fqdn,
-                        min_labels=len(fqdn) - len(name),
-                        include_self=True,
+                    name__iregex=regex_from_list(
+                        get_parent_zone_names(
+                            instance.fqdn,
+                            min_labels=len(fqdn) - len(name),
+                            include_self=True,
+                        )
                     ),
                 ).exists():
                     context["mask_warning"] = _(

{netbox_plugin_dns-1.2.4.dist-info → netbox_plugin_dns-1.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.4
+Version: 1.2.6
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns

{netbox_plugin_dns-1.2.4.dist-info → netbox_plugin_dns-1.2.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=IK52Nv5uZ8o5PxRMYHWrkVWja58odhfoYaHhG3rQgn4,3053
+netbox_dns/__init__.py,sha256=SRd9IcagSOm_ILlfm6xe1UBrFQTJ9GH_S7eP4G42vgI,3098
 netbox_dns/apps.py,sha256=JCW5eS-AQBUubDJve1DjP-IRFKTFGQh1NLGWzJpC5MI,151
 netbox_dns/navigation.py,sha256=36clAzlWftW94_VZ3EHu8_btzzA_dah50CLTfoov-O4,6226
 netbox_dns/template_content.py,sha256=T06L7-m4eGrLMeGsCvPpQLAGfn3S2FL7z0Cd1hhbisY,4225
@@ -20,11 +20,12 @@ netbox_dns/api/serializers_/zone_template.py,sha256=NQFycXBNcHSMPID62o6w6EKbPkj_
 netbox_dns/choices/__init__.py,sha256=jOVs2VGV5SVADRlqVnrFeAy26i8BIeEAbGpiX7K8bL8,42
 netbox_dns/choices/record.py,sha256=ZSpyiZE2YCsF2wF53A5DFWgwCIhkFhgOKt__RJ0KxSk,2084
 netbox_dns/choices/zone.py,sha256=Vblm5RUtNtPNkULh8U1NxBMme1iHPllD6B6LkQkWZW4,621
-netbox_dns/fields/__init__.py,sha256=U1nbFIwwtvr10pp3Sk91jEZeWkVQBSJtr0BVWYgOfiA,89
+netbox_dns/fields/__init__.py,sha256=zvUOvkEy68tL7nNPfFrxE5_nbvr-pzo6UBJSNdAEylE,115
 netbox_dns/fields/address.py,sha256=qNLHmpwwJ3TevljG1QsUr_f2h6NrPsK6wr-R-Ti8eZI,1262
 netbox_dns/fields/ipam.py,sha256=wla-kBm77BpD0LNQhgRZS1RYbVois7WDqPpyQkUT02k,481
 netbox_dns/fields/network.py,sha256=a5nTzjscRufxgMjVsf5juszSYuTujU50pQ9P7q4qMVs,3740
 netbox_dns/fields/rfc2317.py,sha256=y72PZKlXZ8_6P4eeWZ8IF3gqOMjPxW48gk3AB81XboE,2642
+netbox_dns/fields/timeperiod.py,sha256=QEdrmczeZWpBCuZubFrWxiHtm973qneGMM2LvtIosqM,901
 netbox_dns/filtersets/__init__.py,sha256=f8zJhpC3-TyK1OMgTaXmm1E6C2wUc1mNtoI6LOKkljQ,210
 netbox_dns/filtersets/nameserver.py,sha256=7hk9Wh4v4-IHP44rQC4nhdvpYbDYNYYf-XZp6Yo72xE,1203
 netbox_dns/filtersets/record.py,sha256=Ao2666F6z435TXD_hV2dgItI0sWXlS-jyQ1TQZEL8Yc,3913
@@ -36,19 +37,20 @@ netbox_dns/filtersets/zone.py,sha256=zl39SOiYIZxAi3G1wx0s9UEIgh8hG9Bdb46qIXLwMr8
 netbox_dns/filtersets/zone_template.py,sha256=So-sxWeDhlm-DTtujYp5B_gDbnAVUHnLdRZgw7cOc4o,4347
 netbox_dns/forms/__init__.py,sha256=axENVF9vX9BtDKCNxrapRjye1NnygUg9BS0BBj6a0io,209
 netbox_dns/forms/nameserver.py,sha256=GJe3ece4yIGwMtLZ6wQihBrJu1dk_ZSiwX-vSU0fRa0,3397
-netbox_dns/forms/record.py,sha256=QNGLqWprhsGFTSlH2YAe-SHmCx1K1QbT_osAhCegyJg,8252
-netbox_dns/forms/record_template.py,sha256=uN6ZSepNilQuqyfPpW-pMfmTRWo0IrDxp1LdOrlAo5A,6240
+netbox_dns/forms/record.py,sha256=wkl3YpbKfq0bH6U8atNYrYwrV-kNPRqG1PRQG3X1eHA,8389
+netbox_dns/forms/record_template.py,sha256=BdcDkQ5VPER3-nBKq6R1MINOG__H8yGa4uqdIqoLZuU,6474
 netbox_dns/forms/registrar.py,sha256=GaRH3w5zlhrpwy_U0pxlrl1DrAEaMB78MUlnGxBRwZI,3949
 netbox_dns/forms/registration_contact.py,sha256=IhNAqElY7hOdpDG0jwWMdy3y2mB43xmjUhj3lsgJ3SE,5906
 netbox_dns/forms/view.py,sha256=GacwKHXSDvxQEs-d3ys7rietqA_MzpSd0XjWaSsIbU0,10339
-netbox_dns/forms/zone.py,sha256=EAI16GZ1gjt8nn8AcS75ZmncL6K27f4h6XLbVNJKZB4,25824
-netbox_dns/forms/zone_template.py,sha256=z9Ys8uNCH9Inxmvz7qLLoA7enb3-pxQ_9-O0vcQ-y94,9854
+netbox_dns/forms/zone.py,sha256=XRMt9qjIC6d0klRATtAeMKs6zKMh6JatX8DYwxBdMHM,26155
+netbox_dns/forms/zone_template.py,sha256=P7jdEz0MI_tjD_fuVDuKOIFCInqGI4opf7l_qaDmG1g,10098
 netbox_dns/graphql/__init__.py,sha256=jghYD6uOSAis6YyLbtI3YJGZfwPw1uL2FBRsHs1EhNk,514
 netbox_dns/graphql/filters.py,sha256=fHCjFIwbPBJJMk2W7HI8LhrfFhCtQtCM9IE8ZMgVafc,1766
 netbox_dns/graphql/schema.py,sha256=q9DQ_hfRB0e6Znq4-IS6UEeTOfMkZmrWkwxcAql1uOA,2270
 netbox_dns/graphql/types.py,sha256=zAH8bkMCQdp9_g8HzBdrxSS0spxLwvqHhMA61kp65gk,8268
 netbox_dns/locale/de/LC_MESSAGES/django.mo,sha256=L0qwlTBiL4M5IRoN33eejQRgzP11oinumTdGzrsfKEA,20148
 netbox_dns/locale/en/LC_MESSAGES/django.mo,sha256=GDnSZkfHs3yjtTsll7dksEEej4B50F8pc9RGytZNubM,393
+netbox_dns/locale/fr/LC_MESSAGES/django.mo,sha256=r6ue_d6ccBgVR6BiEafvTZ1j5MU0NnOLwp1GZrOJ3Cw,20631
 netbox_dns/management/commands/cleanup_database.py,sha256=1-tAl0Sht80qaNZyfFyUW19Eh9gBUuc7GdbHN4aemGU,5935
 netbox_dns/management/commands/cleanup_rrset_ttl.py,sha256=UFRURLBcFeGHUS2lrYFv7UWIebjI72aG1EUQJt0XsXw,2046
 netbox_dns/management/commands/rebuild_dnssync.py,sha256=Tcl385u6kJTX47SvSyRzKm1RIx4nYRYCMcKr3uVnV60,1246
@@ -68,6 +70,7 @@ netbox_dns/migrations/0010_view_ip_address_filter.py,sha256=uARQADJB7u1vpx0TBlOf
 netbox_dns/migrations/0011_rename_related_fields.py,sha256=j9lI-QBmTSzOrAxDl02SdgHZtv9nRfJ3cZX_wjj5urM,1881
 netbox_dns/migrations/0012_natural_ordering.py,sha256=h5XVSmRwisUqz5OJzkBW41dwHIBlu08zqG2-1mxiiw4,2725
 netbox_dns/migrations/0013_zonetemplate_soa_mname_zonetemplate_soa_rname.py,sha256=Y6TdD_dUZ-Pb1kuRR3l3kSwObn_Cpcmp3tm75qSkc5g,795
+netbox_dns/migrations/0014_alter_unique_constraints_lowercase.py,sha256=Ueesv7uoB2ZQ1-7kG_qsMlPv0mn3mdDeI8OoAKIschM,1409
 netbox_dns/migrations/0020_netbox_3_4.py,sha256=UMcHdn8ZAuQjUaM_3rEGpktYrM0TuvhccD7Jt7WQnPs,1271
 netbox_dns/migrations/0021_record_ip_address.py,sha256=EqdhWXmq7aiK4X79xTRUZng3zFncCl-8JoO65HqlJKw,3244
 netbox_dns/migrations/0022_search.py,sha256=KW1ffEZ4-0dppGQ_KD1EN7iw8eQJOnDco-xfJFRZqKQ,172
@@ -82,13 +85,13 @@ netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 netbox_dns/mixins/__init__.py,sha256=LxTEfpod_RHCyMtnzDljv0_dwqp2z3Q6tqbXW8LTGD8,35
 netbox_dns/mixins/object_modification.py,sha256=AR64fU5f7g-scNAj9b54eSoS9dpjyOpqrxXVXPcOhY8,1807
 netbox_dns/models/__init__.py,sha256=iTTJNgUfPAmU4n41usqDSGPvncd4Wpsb9f43ryVDDOs,209
-netbox_dns/models/nameserver.py,sha256=8wUutl50DhYJusd55rIFSnZFaT_Yqj81KOeYqmrPR9I,3459
-netbox_dns/models/record.py,sha256=Qp2N35JrUsSmmUyrTTKIE0CoYRakrGcte73-PB5ktpc,29467
-netbox_dns/models/record_template.py,sha256=WcwcVnjy97dgMQVSLJaX_2YJXGKS-AlFb_4QYf6vwOg,5210
+netbox_dns/models/nameserver.py,sha256=ivZpIVfgQLdDhrtqYPi-zRbygVgl3aff2FMsq1M3qA8,4044
+netbox_dns/models/record.py,sha256=ot2f5LVxj4ZjNanE29y-30iUK4YZS7-0-37ds3hWtjo,29716
+netbox_dns/models/record_template.py,sha256=kt-_sMFSMKmuKU8voVqz1-Lh7Wi7lPcA2ExPFQYLoxM,5345
 netbox_dns/models/registrar.py,sha256=L5tbO8rtOa0VCs_y90nHYLKSRKBnnUhh_6sxZ3Mm2kk,1942
 netbox_dns/models/registration_contact.py,sha256=O7T1clUjuilZnDjvhJKaHZdmNEF4aLg2h8K5p4llWOs,3825
 netbox_dns/models/view.py,sha256=gQvKNr_FmhG2EMz2T8kWbdK4b8CyqI-Qc67-Dgrx2SI,4808
-netbox_dns/models/zone.py,sha256=PyfFc32E1McdJAt5IoEHis5gwmUvr5cWeCGMXpQacnY,32880
+netbox_dns/models/zone.py,sha256=GhFtsOkA0zPB0VMfXtqFgJZrnrLul-SqgouZbMBcc50,33465
 netbox_dns/models/zone_template.py,sha256=QjjOvSZktH_6l64bCZzVudnL1s9qU6_ZVDkhrhW1zqc,4970
 netbox_dns/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/signals/ipam_dnssync.py,sha256=1zhlf4cMcJLlFosX7YzyqVYdFFHV4MFwTz5KCdL8xQc,7730
@@ -126,24 +129,24 @@ netbox_dns/templates/netbox_dns/zone/rfc2317_child_zone.html,sha256=rWlmb3zRQbLY
 netbox_dns/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/templatetags/netbox_dns.py,sha256=DND1DMPzv636Rak3M6Hor_Vw6pjqUfSTquofIw4dIsA,223
 netbox_dns/utilities/__init__.py,sha256=cSGf-nGaRWx9b-Xrh3dLMJYoWNsZ6FF-qdmV4F1uOgg,74
-netbox_dns/utilities/conversions.py,sha256=FXvYCo7WLtvcf63zoQBkb4rr_TxxzXz8imZAfKGpk7E,2596
-netbox_dns/utilities/dns.py,sha256=QKST49UkCw7n2GyrN3wU5ap6Cw98t1SZxFYJlyG2x70,315
-netbox_dns/utilities/ipam_dnssync.py,sha256=tFphPVluDUS3-4NsUW1_D1dDksA3AgIozf7JAoTIE_w,9533
+netbox_dns/utilities/conversions.py,sha256=eKA17FSU-Us3cfda9DAgtZgmr3r2o5UbJ_1giD3LLvE,2713
+netbox_dns/utilities/dns.py,sha256=UBiyQe8thiOTnKOmU9e2iRHHnGF9toVLe4efU623kX4,322
+netbox_dns/utilities/ipam_dnssync.py,sha256=_yuHoah_QN-opsZB51yGCkwjkij7nrmTgKHUZ-bQrBI,9625
 netbox_dns/validators/__init__.py,sha256=Mr8TvmcJTa8Pubj8TzbFBKfbHhEmGcr5JdQvczEJ39A,72
 netbox_dns/validators/dns_name.py,sha256=Sil68Av49jfZPzgFMV_1qEcLnuuAWXmbxfAJPDXUsGg,3766
 netbox_dns/validators/dns_value.py,sha256=-mc62mth-hlbPUPe_RlCR7vo1KSD6_gQDXiE8rjB-Cc,5206
 netbox_dns/validators/rfc2317.py,sha256=uKkwxpakiFFKdYA0qy8WSlEnbFwJD4MDw6gGV4F6skg,706
 netbox_dns/views/__init__.py,sha256=axENVF9vX9BtDKCNxrapRjye1NnygUg9BS0BBj6a0io,209
 netbox_dns/views/nameserver.py,sha256=6lHg8fqBjc_SoITzFj1FiRARpPF7nSn9knAZxe9x5Rg,3932
-netbox_dns/views/record.py,sha256=quFf9BIQJIb8uodD8-7HBmOHBH7xe-Vu8UMr3Q5jZNo,6496
+netbox_dns/views/record.py,sha256=6tOTC7BbQ5XOC7wr94LjFMR3epOi47HP5qIETNvj5sE,6715
 netbox_dns/views/record_template.py,sha256=CbSyckBvyEvcZCeZgK3q0fJsa1_5HbwUflh_iM7JjH0,3134
 netbox_dns/views/registrar.py,sha256=Um_2wnzmP2bqbdMUhBPhny2My0R8fMXScQ9GLiTCrvg,2808
 netbox_dns/views/registration_contact.py,sha256=c9KrNkfFNsb55pL74A5rN1CNx32M82V6mdwBYduNxas,3596
 netbox_dns/views/view.py,sha256=VfrKaLC9D_KNZNmRyFVohRlmMlMbtblAuPgNg0LNyf8,3421
 netbox_dns/views/zone.py,sha256=W66Miyaf4RKW-8z5wMrerrtmHclhht3h-lPqTWFpiOw,7163
 netbox_dns/views/zone_template.py,sha256=IIW1lr6RQmhShtqJu6A6LnHdxdBrkkZQHxIDSTqQeyc,2705
-netbox_plugin_dns-1.2.4.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
-netbox_plugin_dns-1.2.4.dist-info/METADATA,sha256=JB-PQlr1KnJ1dJV7qQzZIVjTLsZnHJFgJJtFoW2eXys,7636
-netbox_plugin_dns-1.2.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-netbox_plugin_dns-1.2.4.dist-info/top_level.txt,sha256=sA1Rwl1mRKvMC6XHe2ylZ1GF-Q1NGd08XedK9Y4xZc4,11
-netbox_plugin_dns-1.2.4.dist-info/RECORD,,
+netbox_plugin_dns-1.2.6.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
+netbox_plugin_dns-1.2.6.dist-info/METADATA,sha256=9-3nqBkJcPlEPjHWCFAB9RjUwRr2HqojNEmhk0yzMDA,7636
+netbox_plugin_dns-1.2.6.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+netbox_plugin_dns-1.2.6.dist-info/top_level.txt,sha256=sA1Rwl1mRKvMC6XHe2ylZ1GF-Q1NGd08XedK9Y4xZc4,11
+netbox_plugin_dns-1.2.6.dist-info/RECORD,,

{netbox_plugin_dns-1.2.4.dist-info → netbox_plugin_dns-1.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any