netbox-plugin-dns 1.1.3__tar.gz → 1.1.4__tar.gz

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.3
+Version: 1.1.4
 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
@@ -32,7 +32,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 
 > [!WARNING]
 > **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
-> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This affects multiple aspects of the branching functionality, and currently there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
 > This warning will be updated as soon as the situation is resolved.
 
 ## Objectives

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/README.md

@@ -16,7 +16,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 
 > [!WARNING]
 > **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
-> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This affects multiple aspects of the branching functionality, and currently there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
 > This warning will be updated as soon as the situation is resolved.
 
 ## Objectives

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/__init__.py

@@ -4,9 +4,9 @@ from django.utils.translation import gettext_lazy as _
 from netbox.plugins import PluginConfig
 from ipam.choices import IPAddressStatusChoices
 
-from netbox_dns.choices import RecordTypeChoices
+from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 
 
 class DNSConfig(PluginConfig):
@@ -26,6 +26,13 @@ class DNSConfig(PluginConfig):
         "zone_soa_retry": 7200,
         "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
+        "zone_active_status": [
+            ZoneStatusChoices.STATUS_ACTIVE,
+            ZoneStatusChoices.STATUS_DYNAMIC,
+        ],
+        "record_active_status": [
+            RecordStatusChoices.STATUS_ACTIVE,
+        ],
         "dnssync_disabled": False,
         "dnssync_ipaddress_active_status": [
             IPAddressStatusChoices.STATUS_ACTIVE,

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/choices/zone.py

@@ -13,10 +13,12 @@ class ZoneStatusChoices(ChoiceSet):
     STATUS_RESERVED = "reserved"
     STATUS_DEPRECATED = "deprecated"
     STATUS_PARKED = "parked"
+    STATUS_DYNAMIC = "dynamic"
 
     CHOICES = [
         (STATUS_ACTIVE, _("Active"), "blue"),
         (STATUS_RESERVED, _("Reserved"), "cyan"),
         (STATUS_DEPRECATED, _("Deprecated"), "red"),
         (STATUS_PARKED, _("Parked"), "gray"),
+        (STATUS_DYNAMIC, _("Dynamic"), "orange"),
     ]

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/fields/address.py

@@ -1,31 +1,13 @@
-from django import forms
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from netaddr import AddrFormatError, IPAddress
 
+from ipam.formfields import IPAddressFormField
 
-__all__ = (
-    "AddressFormField",
-    "AddressField",
-)
 
-
-class AddressFormField(forms.Field):
-    def to_python(self, value):
-        if not value:
-            return None
-
-        if isinstance(value, IPAddress):
-            return value
-
-        try:
-            ip_address = IPAddress(value)
-        except AddrFormatError as exc:
-            raise ValidationError(exc)
-
-        return ip_address
+__all__ = ("AddressField",)
 
 
 class AddressField(models.Field):
@@ -58,7 +40,7 @@ class AddressField(models.Field):
         return str(self.to_python(value))
 
     def form_class(self):
-        return AddressFormField
+        return IPAddressFormField
 
     def formfield(self, **kwargs):
         defaults = {"form_class": self.form_class()}

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/filtersets/record.py

@@ -76,6 +76,9 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         method="filter_ip_address",
         label=_("IP Address"),
     )
+    active = django_filters.BooleanFilter(
+        label=_("Record is active"),
+    )
 
     managed = django_filters.BooleanFilter()
 
@@ -89,6 +92,7 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "ttl",
             "value",
             "disable_ptr",
+            "active",
             "managed",
         )
 

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/forms/record.py

@@ -38,12 +38,6 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        initial_zone_id = self.initial.get("zone")
-        if initial_zone_id is not None:
-            self.initial["view"] = Zone.objects.get(pk=initial_zone_id).view
-        else:
-            self.initial["view"] = View.get_default_view()
-
         initial_name = self.initial.get("name")
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
@@ -51,6 +45,9 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     view = DynamicModelChoiceField(
         queryset=View.objects.all(),
         required=False,
+        initial_params={
+            "zone": "$zone",
+        },
         label=_p("DNS", "View"),
     )
     zone = DynamicModelChoiceField(
@@ -111,6 +108,7 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
+            "view_id",
             "zone_id",
             "name",
             "fqdn",
@@ -118,6 +116,7 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "value",
             "disable_ptr",
             "status",
+            "active",
             "description",
             name=_("Attributes"),
         ),
@@ -151,10 +150,23 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    view_id = DynamicModelMultipleChoiceField(
+        queryset=View.objects.all(),
+        required=False,
+        label=_("View"),
+    )
     zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
         label=_("Zone"),
+        query_params={
+            "view_id": "$view_id",
+        },
+    )
+    active = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Active"),
     )
     description = forms.CharField(
         required=False,

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/forms/zone.py

@@ -354,6 +354,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "status",
             "name",
             "nameserver_id",
+            "active",
             "description",
             name=_("Attributes"),
         ),
@@ -400,6 +401,11 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Nameservers"),
     )
+    active = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Active"),
+    )
     description = forms.CharField(
         required=False,
         label=_("Description"),
@@ -781,7 +787,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     tenant_group = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         required=False,
-        label=_("Tenant"),
+        label=_("Tenant Group"),
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/models/record.py

@@ -34,6 +34,9 @@ __all__ = (
     "RecordIndex",
 )
 
+ZONE_ACTIVE_STATUS_LIST = get_plugin_config("netbox_dns", "zone_active_status")
+RECORD_ACTIVE_STATUS_LIST = get_plugin_config("netbox_dns", "record_active_status")
+
 
 def min_ttl(*ttl_list):
     return min((ttl for ttl in ttl_list if ttl is not None), default=None)
@@ -102,14 +105,14 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
             .annotate(
                 active=ExpressionWrapper(
                     Q(
-                        Q(zone__status__in=zone.Zone.ACTIVE_STATUS_LIST)
+                        Q(zone__status__in=ZONE_ACTIVE_STATUS_LIST)
                         & Q(
                             Q(address_record__isnull=True)
                             | Q(
-                                address_record__zone__status__in=zone.Zone.ACTIVE_STATUS_LIST
+                                address_record__zone__status__in=ZONE_ACTIVE_STATUS_LIST
                             )
                         )
-                        & Q(status__in=Record.ACTIVE_STATUS_LIST)
+                        & Q(status__in=RECORD_ACTIVE_STATUS_LIST)
                     ),
                     output_field=BooleanField(),
                 )
@@ -118,8 +121,6 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
 
 
 class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
-    ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
-
     unique_ptr_qs = Q(
         Q(disable_ptr=False),
         Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
@@ -295,8 +296,8 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     @property
     def is_active(self):
         return (
-            self.status in Record.ACTIVE_STATUS_LIST
-            and self.zone.status in zone.Zone.ACTIVE_STATUS_LIST
+            self.status in RECORD_ACTIVE_STATUS_LIST
+            and self.zone.status in ZONE_ACTIVE_STATUS_LIST
         )
 
     @property
@@ -597,7 +598,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     def validate_value(self):
         try:
-            validate_record_value(self.type, self.value)
+            validate_record_value(self)
         except ValidationError as exc:
             raise ValidationError({"value": exc})
 
@@ -616,7 +617,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             name=self.name,
             type=self.type,
             value=self.value,
-            status__in=Record.ACTIVE_STATUS_LIST,
+            status__in=RECORD_ACTIVE_STATUS_LIST,
         )
 
         if not self._state.adding:
@@ -653,7 +654,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             name=self.name,
             type=self.type,
             value=self.value,
-            status__in=Record.ACTIVE_STATUS_LIST,
+            status__in=RECORD_ACTIVE_STATUS_LIST,
             ipam_ip_address__isnull=True,
         )
 

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/models/record_template.py

@@ -137,7 +137,7 @@ class RecordTemplate(NetBoxModel):
 
     def validate_value(self):
         try:
-            validate_record_value(self.type, self.value)
+            validate_record_value(self)
         except ValidationError as exc:
             raise ValidationError({"value": exc}) from None
 

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/models/zone.py

@@ -53,6 +53,9 @@ __all__ = (
     "ZoneIndex",
 )
 
+ZONE_ACTIVE_STATUS_LIST = get_plugin_config("netbox_dns", "zone_active_status")
+RECORD_ACTIVE_STATUS_LIST = get_plugin_config("netbox_dns", "record_active_status")
+
 
 class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
     """
@@ -65,15 +68,13 @@ class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
             .get_queryset()
             .annotate(
                 active=ExpressionWrapper(
-                    Q(status__in=Zone.ACTIVE_STATUS_LIST), output_field=BooleanField()
+                    Q(status__in=ZONE_ACTIVE_STATUS_LIST), output_field=BooleanField()
                 )
             )
         )
 
 
 class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
-    ACTIVE_STATUS_LIST = (ZoneStatusChoices.STATUS_ACTIVE,)
-
     def __init__(self, *args, **kwargs):
         kwargs.pop("template", None)
 
@@ -299,11 +300,21 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     @staticmethod
     def get_defaults():
+        default_fields = (
+            "zone_default_ttl",
+            "zone_soa_ttl",
+            "zone_soa_serial",
+            "zone_soa_refresh",
+            "zone_soa_retry",
+            "zone_soa_expire",
+            "zone_soa_minimum",
+            "zone_soa_rname",
+        )
+
         return {
             field[5:]: value
             for field, value in settings.PLUGINS_CONFIG.get("netbox_dns").items()
-            if field.startswith("zone_")
-            and field not in ("zone_soa_mname", "zone_nameservers")
+            if field in default_fields
         }
 
     @property
@@ -337,7 +348,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     @property
     def is_active(self):
-        return self.status in Zone.ACTIVE_STATUS_LIST
+        return self.status in ZONE_ACTIVE_STATUS_LIST
 
     @property
     def is_reverse_zone(self):
@@ -474,7 +485,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             relative_name = name.relativize(parent).to_text()
             address_records = Record.objects.filter(
                 Q(zone=ns_zone),
-                Q(status__in=Record.ACTIVE_STATUS_LIST),
+                Q(status__in=RECORD_ACTIVE_STATUS_LIST),
                 Q(Q(name=f"{_nameserver.name}.") | Q(name=relative_name)),
                 Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
             )

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/signals/ipam_dnssync.py

@@ -63,7 +63,7 @@ def ipam_dnssync_ipaddress_post_clean(instance, **kwargs):
                     {
                         "dns_name": _(
                             "Unique DNS records are enforced and there is already "
-                            "an active IP address {address} with DNS name {name}. Plesase choose "
+                            "an active IP address {address} with DNS name {name}. Please choose "
                             "a different name or disable record creation for this IP address."
                         ).format(address=instance.address, name=instance.dns_name)
                     }

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_dns/validators/dns_value.py

@@ -1,5 +1,8 @@
-import dns
+import re
+import textwrap
+
 from dns import rdata, name as dns_name
+from dns.exception import SyntaxError
 
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
@@ -11,11 +14,12 @@ from netbox_dns.validators import (
     validate_generic_name,
 )
 
+MAX_TXT_LENGTH = 255
 
 __all__ = ("validate_record_value",)
 
 
-def validate_record_value(record_type, value):
+def validate_record_value(record):
     def _validate_idn(name):
         try:
             name.to_unicode()
@@ -26,16 +30,53 @@ def validate_record_value(record_type, value):
                 )
             )
 
+    def _split_text_value(value):
+        # +
+        # Text values longer than 255 characters need to be broken up for TXT and
+        # SPF records.
+        # First, in case they had been split into separate strings, reassemble the
+        # original (long) value, then split it into chunks of a maximum length of
+        # 255 (preferably at word boundaries), and then build a sequence of partial
+        # strings enclosed in double quotes and separated by space.
+        #
+        # See https://datatracker.ietf.org/doc/html/rfc4408#section-3.1.3 for details.
+        # -
+        raw_value = "".join(re.findall(r'"([^"]+)"', value))
+        if not raw_value:
+            raw_value = value
+
+        return " ".join(
+            f'"{part}"'
+            for part in textwrap.wrap(raw_value, MAX_TXT_LENGTH, drop_whitespace=False)
+        )
+
+    if record.type in (RecordTypeChoices.TXT, RecordTypeChoices.SPF):
+        if not (record.value.isascii() and record.value.isprintable()):
+            raise ValidationError(
+                _(
+                    "Record value {value} for a type {type} record is not a printable ASCII string."
+                ).format(value=record.value, type=record.type)
+            )
+
+        if len(record.value) <= MAX_TXT_LENGTH:
+            return
+
+        try:
+            rr = rdata.from_text(RecordClassChoices.IN, record.type, record.value)
+        except SyntaxError as exc:
+            if str(exc) == "string too long":
+                record.value = _split_text_value(record.value)
+
     try:
-        rr = rdata.from_text(RecordClassChoices.IN, record_type, value)
-    except dns.exception.SyntaxError as exc:
+        rr = rdata.from_text(RecordClassChoices.IN, record.type, record.value)
+    except SyntaxError as exc:
         raise ValidationError(
             _(
                 "Record value {value} is not a valid value for a {type} record: {error}."
-            ).format(value=value, type=record_type, error=exc)
+            ).format(value=record.value, type=record.type, error=exc)
         )
 
-    match record_type:
+    match record.type:
         case RecordTypeChoices.CNAME:
             _validate_idn(rr.target)
             validate_domain_name(

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.3
+Version: 1.1.4
 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
@@ -32,7 +32,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 
 > [!WARNING]
 > **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
-> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This affects multiple aspects of the branching functionality, and currently there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
 > This warning will be updated as soon as the situation is resolved.
 
 ## Objectives

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.1.3"
+version = "1.1.4"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},