netbox-plugin-dns 1.4.1__tar.gz → 1.4.3__tar.gz

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.4.1
+Version: 1.4.3
 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.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/__init__.py

@@ -4,7 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
 from netbox.plugins import PluginConfig
 from netbox.plugins.utils import get_plugin_config
 
-__version__ = "1.4.1"
+__version__ = "1.4.3"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/api/nested_serializers.py

@@ -145,6 +145,7 @@ class NestedDNSSECPolicySerializer(WritableNestedSerializer):
             "name",
             "description",
             "status",
+            "inline_signing",
         )
 
     url = serializers.HyperlinkedIdentityField(

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/api/serializers_/dnssec_policy.py

@@ -26,6 +26,7 @@ class DNSSECPolicySerializer(NetBoxModelSerializer):
             "description",
             "status",
             "tags",
+            "inline_signing",
             "key_templates",
             "zones",
             "zone_templates",
@@ -60,6 +61,7 @@ class DNSSECPolicySerializer(NetBoxModelSerializer):
             "name",
             "description",
             "status",
+            "inline_signing",
         )
 
     url = serializers.HyperlinkedIdentityField(

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/api/serializers_/zone.py

@@ -61,6 +61,7 @@ class ZoneSerializer(NetBoxModelSerializer):
             "tech_c",
             "admin_c",
             "billing_c",
+            "comments",
             "active",
             "custom_fields",
             "tenant",
@@ -195,6 +196,7 @@ class ZoneSerializer(NetBoxModelSerializer):
         default=None,
         help_text=_("Template to apply to the zone"),
     )
+    inline_signing = serializers.SerializerMethodField()
     active = serializers.BooleanField(
         required=False,
         read_only=True,
@@ -212,6 +214,9 @@ class ZoneSerializer(NetBoxModelSerializer):
 
         return super().validate(data)
 
+    def get_inline_signing(self, instance):
+        return instance.inline_signing
+
     def create(self, validated_data):
         template = validated_data.pop("template", None)
         nameservers = validated_data.pop("nameservers", None)

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/fields/address.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.db.models import Lookup
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
@@ -50,3 +51,19 @@ class AddressField(models.Field):
 
     def db_type(self, connection):
         return "inet"
+
+
+class AddressContained(Lookup):
+    lookup_name = "contained"
+
+    def get_prep_lookup(self):
+        return str(self.rhs)
+
+    def as_sql(self, compiler, connection):
+        lhs, lhs_params = self.process_lhs(compiler, connection)
+        rhs, rhs_params = self.process_rhs(compiler, connection)
+        params = lhs_params + rhs_params
+        return f"CAST(HOST({lhs}) AS INET) <<= {rhs}", params
+
+
+AddressField.register_lookup(AddressContained)

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/filtersets/dnssec_policy.py

@@ -23,6 +23,7 @@ class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "name",
             "description",
             "status",
+            "inline_signing",
             "dnskey_ttl",
             "purge_keys",
             "publish_safety",

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/filtersets/zone.py

@@ -41,9 +41,9 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "soa_minimum",
             "soa_serial_auto",
             "rfc2317_parent_managed",
-            "inline_signing",
             "registry_domain_id",
             "domain_status",
+            "inline_signing",
         )
 
     status = django_filters.MultipleChoiceFilter(
@@ -172,6 +172,10 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     active = django_filters.BooleanFilter(
         label=_("Zone is active"),
     )
+    inline_signing = django_filters.BooleanFilter(
+        label=_("Zone is using a DNSSEC policy with inline signing"),
+        method="filter_inline_signing",
+    )
 
     def filter_parental_agents(self, queryset, name, value):
         if not value:
@@ -214,6 +218,22 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         except (netaddr.AddrFormatError, ValueError):
             return queryset.none()
 
+    def filter_inline_signing(self, queryset, name, value):
+        if value is None:
+            return queryset
+
+        if value:
+            return queryset.filter(
+                dnssec_policy__isnull=False, dnssec_policy__inline_signing=True
+            )
+        else:
+            return queryset.filter(
+                Q(
+                    Q(dnssec_policy__isnull=True)
+                    | Q(dnssec_policy__inline_signing=False)
+                )
+            )
+
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset
@@ -228,5 +248,6 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             | Q(admin_c__name__icontains=value)
             | Q(tech_c__name__icontains=value)
             | Q(billing_c__name__icontains=value)
+            | Q(comments__icontains=value)
         )
         return queryset.filter(qs_filter)

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/forms/dnssec_policy.py

@@ -41,6 +41,7 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "name",
             "description",
             "status",
+            "inline_signing",
             "key_templates",
             "dnskey_ttl",
             "purge_keys",
@@ -71,6 +72,7 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "description",
             "status",
             "key_templates",
+            "inline_signing",
             name=_("Attributes"),
         ),
         FieldSet(
@@ -111,6 +113,14 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         ),
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if not self.initial.get("use_nsec3"):
+            self.initial["nsec3_iterations"] = None
+            self.initial["nsec3_opt_out"] = None
+            self.initial["nsec3_salt_size"] = None
+
     key_templates = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
@@ -178,6 +188,21 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         label=_("Parent Propagation Delay"),
         placeholder=DNSSECPolicy.get_fallback_setting("parent_propagation_delay"),
     )
+    nsec3_opt_out = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("NSEC3 Opt-Out"),
+    )
+
+    def clean(self, *args, **kwargs):
+        super().clean(*args, **kwargs)
+
+        if not self.cleaned_data.get("use_nsec3"):
+            self.cleaned_data["nsec3_iterations"] = None
+            self.cleaned_data["nsec3_opt_out"] = None
+            self.cleaned_data["nsec3_salt_size"] = None
+
+        return self.cleaned_data
 
 
 class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
@@ -194,6 +219,7 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "description",
             "status",
             "key_template_id",
+            "inline_signing",
             name=_("Attributes"),
         ),
         FieldSet(
@@ -250,6 +276,11 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    inline_signing = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Use Inline Signing"),
+    )
     key_template_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
@@ -355,6 +386,7 @@ class DNSSECPolicyImportForm(NetBoxModelImportForm):
         fields = (
             "name",
             "description",
+            "inline_signing",
             "key_templates",
             "dnskey_ttl",
             "purge_keys",
@@ -383,6 +415,10 @@ class DNSSECPolicyImportForm(NetBoxModelImportForm):
         required=False,
         label=_("Status"),
     )
+    inline_signing = forms.BooleanField(
+        required=False,
+        label=_("Use Inline Signing"),
+    )
     dnskey_ttl = TimePeriodField(
         required=False,
         label=_("DNSKEY TTL"),
@@ -446,6 +482,7 @@ class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "description",
             "key_templates",
+            "inline_signing",
             name=_("Attributes"),
         ),
         FieldSet(
@@ -516,6 +553,11 @@ class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Status"),
     )
+    inline_signing = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect(),
+        label=_("Use Inline Signing"),
+    )
     dnskey_ttl = TimePeriodField(
         required=False,
         label=_("DNSKEY TTL"),

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/forms/zone.py

@@ -20,6 +20,7 @@ from utilities.forms.fields import (
     CSVModelChoiceField,
     CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
+    CommentField,
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, HTMXSelect
 from utilities.forms.rendering import FieldSet
@@ -183,7 +184,6 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "rfc2317_prefix",
             "rfc2317_parent_managed",
             "dnssec_policy",
-            "inline_signing",
             "parental_agents",
             "registrar",
             "registry_domain_id",
@@ -195,6 +195,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "billing_c",
             "tenant_group",
             "tenant",
+            "comments",
             "tags",
         )
 
@@ -241,7 +242,6 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         ),
         FieldSet(
             "dnssec_policy",
-            "inline_signing",
             "parental_agents",
             name=_("DNSSEC"),
         ),
@@ -317,7 +317,6 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
                 )
 
         if not get_field_value(self, "dnssec_policy"):
-            del self.fields["inline_signing"]
             del self.fields["parental_agents"]
 
         if not get_field_value(self, "registrar"):
@@ -415,6 +414,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         label=_("RFC2317 Prefix"),
     )
 
+    comments = CommentField()
+
     def clean_default_ttl(self):
         return (
             self.cleaned_data["default_ttl"]
@@ -552,7 +553,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     inline_signing = forms.NullBooleanField(
         required=False,
         widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
-        label=_("Use Inline Signing"),
+        label=_("DNSSEC Policy uses inline signing"),
     )
     parental_agents = forms.GenericIPAddressField(
         required=False,
@@ -632,7 +633,6 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
             "soa_expire",
             "soa_minimum",
             "dnssec_policy",
-            "inline_signing",
             "parental_agents",
             "rfc2317_prefix",
             "rfc2317_parent_managed",
@@ -645,6 +645,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
             "tech_c",
             "billing_c",
             "tenant",
+            "comments",
             "tags",
         )
 
@@ -741,10 +742,6 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
         label=_("DNSSEC Policy"),
     )
-    inline_signing = forms.BooleanField(
-        required=False,
-        label=_("Use Inline Signing"),
-    )
     registrar = CSVModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
@@ -860,7 +857,6 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         ),
         FieldSet(
             "dnssec_policy",
-            "inline_signing",
             "parental_agents",
             name=_("DNSSEC"),
         ),
@@ -900,6 +896,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "tech_c",
         "billing_c",
         "tenant",
+        "comments",
     )
 
     view = DynamicModelChoiceField(
@@ -990,11 +987,6 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("DNSSEC Policy"),
     )
-    inline_signing = forms.NullBooleanField(
-        required=False,
-        widget=BulkEditNullBooleanSelect(),
-        label=_("Use Inline Signing"),
-    )
     parental_agents = SimpleArrayField(
         required=False,
         base_field=forms.GenericIPAddressField(),
@@ -1049,3 +1041,4 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Tenant"),
     )
+    comments = CommentField()

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/graphql/filters/dnssec_policy.py

@@ -34,6 +34,7 @@ class NetBoxDNSDNSSECPolicyFilter(
         ]
         | None
     ) = strawberry_django.filter_field()
+    inline_signing: FilterLookup[bool] | None = strawberry_django.filter_field()
     key_templates: (
         Annotated[
             "NetBoxDNSDNSSECKeyTemplateFilter",

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/graphql/filters/zone.py

@@ -91,7 +91,6 @@ class NetBoxDNSZoneFilter(
         ]
         | None
     )
-    inline_signing: FilterLookup[bool] | None = strawberry_django.filter_field()
 
     registrar: (
         Annotated[
@@ -142,5 +141,7 @@ class NetBoxDNSZoneFilter(
     rfc2317_parent_zone_id: ID | None = strawberry_django.filter_field()
     rfc2317_parent_managed: FilterLookup[bool] | None = strawberry_django.filter_field()
 
+    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+
     arpa_network: FilterLookup[str] | None = strawberry_django.filter_field()
     active: FilterLookup[bool] | None = strawberry_django.filter_field()

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/graphql/types.py

@@ -89,7 +89,7 @@ class NetBoxDNSZoneType(NetBoxObjectType):
         ]
         | None
     )
-    inline_signing: bool
+    inline_signing: bool | None
     parental_agents: List[str]
     registrar: (
         Annotated["NetBoxDNSRegistrarType", strawberry.lazy("netbox_dns.graphql.types")]
@@ -136,6 +136,9 @@ class NetBoxDNSZoneType(NetBoxObjectType):
     rfc2317_child_zones: List[
         Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
     ]
+
+    comments: str | None
+
     arpa_network: str | None
     tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
 
@@ -194,6 +197,7 @@ class NetBoxDNSDNSSECPolicyType(NetBoxObjectType):
     description: str | None
     status: str
     tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
+    inline_signing: bool
     key_templates: List[
         Annotated[
             "NetBoxDNSDNSSECKeyTemplateType",
@@ -216,7 +220,7 @@ class NetBoxDNSDNSSECPolicyType(NetBoxObjectType):
     parent_propagation_delay: BigInt | None
     use_nsec3: bool
     nsec3_iterations: BigInt | None
-    nsec3_opt_out: bool
+    nsec3_opt_out: bool | None
     nsec3_salt_size: BigInt | None
 
 

netbox_plugin_dns-1.4.3/netbox_dns/migrations/0025_remove_zone_inline_signing_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.6 on 2025-10-05 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0024_zonetemplate_parental_agents"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="zone",
+            name="inline_signing",
+        ),
+        migrations.AddField(
+            model_name="dnssecpolicy",
+            name="inline_signing",
+            field=models.BooleanField(default=True),
+        ),
+    ]

netbox_plugin_dns-1.4.3/netbox_dns/migrations/0026_alter_dnssecpolicy_nsec3_opt_out.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.6 on 2025-10-08 14:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0025_remove_zone_inline_signing_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dnssecpolicy",
+            name="nsec3_opt_out",
+            field=models.BooleanField(blank=True, null=True),
+        ),
+    ]

netbox_plugin_dns-1.4.3/netbox_dns/migrations/0027_zone_comments.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-24 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0026_alter_dnssecpolicy_nsec3_opt_out"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zone",
+            name="comments",
+            field=models.TextField(blank=True),
+        ),
+    ]

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/models/dnssec_policy.py

@@ -51,6 +51,11 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
         null=False,
     )
 
+    inline_signing = models.BooleanField(
+        verbose_name=_("Inline Signing"),
+        help_text=_("Use inline signing"),
+        default=True,
+    )
     key_templates = models.ManyToManyField(
         verbose_name=_("Key Templates"),
         to="DNSSECKeyTemplate",
@@ -145,9 +150,8 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
     )
     nsec3_opt_out = models.BooleanField(
         verbose_name=_("NSEC3 Opt-Out"),
-        blank=False,
-        null=False,
-        default=False,
+        blank=True,
+        null=True,
     )
     nsec3_salt_size = models.PositiveIntegerField(
         verbose_name=_("NSEC3 Salt Size"),

{netbox_plugin_dns-1.4.1 → netbox_plugin_dns-1.4.3}/netbox_dns/models/zone.py

@@ -25,6 +25,7 @@ from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
 from ipam.models import IPAddress
+from ipam.choices import IPAddressFamilyChoices
 
 from netbox_dns.choices import (
     RecordClassChoices,
@@ -123,7 +124,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "description",
         "status",
         "dnssec_policy",
-        "inline_signing",
         "parental_agents",
         "registrar",
         "registry_domain_id",
@@ -135,6 +135,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "billing_c",
         "rfc2317_parent_managed",
         "tenant",
+        "comments",
     }
 
     objects = ZoneManager()
@@ -262,11 +263,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
-    inline_signing = models.BooleanField(
-        verbose_name=_("Inline Signing"),
-        help_text=_("Use inline signing for DNSSEC"),
-        default=True,
-    )
     parental_agents = ArrayField(
         base_field=models.GenericIPAddressField(
             protocol="both",
@@ -367,6 +363,10 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
+    comments = models.TextField(
+        verbose_name=_("Comments"),
+        blank=True,
+    )
 
     @property
     def fqdn(self):
@@ -432,6 +432,13 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def is_rfc2317_zone(self):
         return self.rfc2317_prefix is not None
 
+    @property
+    def inline_signing(self):
+        if self.dnssec_policy is None:
+            return None
+
+        return self.dnssec_policy.inline_signing
+
     def get_rfc2317_parent_zone(self):
         if not self.is_rfc2317_zone:
             return None
@@ -801,7 +808,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     def clean(self, *args, **kwargs):
         if not self.dnssec_policy:
-            self.inline_signing = self._meta.get_field("inline_signing").get_default()
             self.parental_agents = self._meta.get_field("parental_agents").get_default()
 
         if not self.registrar:
@@ -970,9 +976,21 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             zones = self.view.zones.filter(
                 arpa_network__net_contains_or_equals=self.arpa_network
             )
+
+            if self.arpa_network.version == IPAddressFamilyChoices.FAMILY_4:
+                record_type = RecordTypeChoices.A
+            else:
+                record_type = RecordTypeChoices.AAAA
+
             address_records = Record.objects.filter(
-                Q(ptr_record__isnull=True) | Q(ptr_record__zone__in=zones),
-                type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
+                Q(
+                    ptr_record__isnull=True,
+                    zone__view=self.view,
+                    ip_address__isnull=False,
+                    ip_address__contained=self.arpa_network,
+                    type=record_type,
+                )
+                | Q(ptr_record__zone__in=zones),
                 disable_ptr=False,
             )
 
@@ -1001,7 +1019,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 arpa_network__net_contains=self.rfc2317_prefix
             )
             address_records = Record.objects.filter(
-                Q(ptr_record__isnull=True)
+                Q(ptr_record__isnull=True, ip_address__contained=self.rfc2317_prefix)
                 | Q(ptr_record__zone__in=zones)
                 | Q(ptr_record__zone=self),
                 type=RecordTypeChoices.A,