netbox-plugin-dns 1.2.4__tar.gz → 1.2.6__tar.gz

{netbox_plugin_dns-1.2.4/netbox_plugin_dns.egg-info → netbox_plugin_dns-1.2.6}/PKG-INFO

@@ -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 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.6/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.6/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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_plugin_dns-1.2.4 → netbox_plugin_dns-1.2.6}/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()