netbox-plugin-dns 1.2.7b2__py3-none-any.whl → 1.2.8__py3-none-any.whl

netbox_dns/forms/zone.py

@@ -23,7 +23,7 @@ from utilities.forms.fields import (
     DynamicModelChoiceField,
 )
 from utilities.release import load_release_data
-from utilities.forms.widgets import BulkEditNullBooleanSelect
+from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker
 from utilities.forms.rendering import FieldSet
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
 from tenancy.models import Tenant, TenantGroup
@@ -38,7 +38,7 @@ from netbox_dns.models import (
     ZoneTemplate,
     DNSSECPolicy,
 )
-from netbox_dns.choices import ZoneStatusChoices
+from netbox_dns.choices import ZoneStatusChoices, ZoneEPPStatusChoices
 from netbox_dns.utilities import name_to_unicode, network_to_reverse
 from netbox_dns.fields import RFC2317NetworkFormField, TimePeriodField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
@@ -59,10 +59,21 @@ class RollbackTransaction(Exception):
 
 
 class ZoneTemplateUpdateMixin:
+    def _check_soa_mname(self):
+        if (
+            self.cleaned_data.get("soa_mname") is None
+            and "soa_mname" in self.fields.keys()
+        ):
+            self.add_error(
+                "soa_mname",
+                _("soa_mname not set and no template or default value defined"),
+            )
+
     def clean(self, *args, **kwargs):
         super().clean(*args, **kwargs)
 
         if (template := self.cleaned_data.get("template")) is None:
+            self._check_soa_mname()
             return
 
         if not self.cleaned_data.get("nameservers") and template.nameservers.all():
@@ -77,11 +88,7 @@ class ZoneTemplateUpdateMixin:
             ) not in (None, ""):
                 self.cleaned_data[field] = getattr(template, field)
 
-        if self.cleaned_data.get("soa_mname") is None:
-            self.add_error(
-                "soa_mname",
-                _("soa_mname not set and no template or default value defined"),
-            )
+        self._check_soa_mname()
 
         if self.errors:
             return
@@ -285,6 +292,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -379,6 +388,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "inline_signing",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -387,8 +398,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "tenant",
             "tags",
         )
-        help_texts = {
-            "soa_mname": _("Primary nameserver for the zone"),
+        widgets = {
+            "expiration_date": DatePicker,
         }
 
 
@@ -412,7 +423,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             name=_("SOA"),
         ),
         FieldSet(
-            "dnssec_policy",
+            "dnssec_policy_id",
             "inline_signing",
             name=_("DNSSEC"),
         ),
@@ -425,6 +436,9 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         FieldSet(
             "registrar_id",
             "registry_domain_id",
+            "expiration_date_before",
+            "expiration_date_after",
+            "domain_status",
             "registrant_id",
             "admin_c_id",
             "tech_c_id",
@@ -451,6 +465,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Nameservers"),
     )
     active = forms.NullBooleanField(
@@ -488,40 +503,67 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     rfc2317_parent_zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Parent Zone"),
     )
-    registrar_id = DynamicModelMultipleChoiceField(
-        queryset=Registrar.objects.all(),
-        required=False,
-        label=_("Registrar"),
-    )
     dnssec_policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("DNSSEC Policy"),
     )
+    inline_signing = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Use Inline Signing"),
+    )
+    registrar_id = DynamicModelMultipleChoiceField(
+        queryset=Registrar.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Registrar"),
+    )
     registry_domain_id = forms.CharField(
         required=False,
         label=_("Registry Domain ID"),
     )
+    expiration_date_after = forms.DateField(
+        required=False,
+        label=_("Expiration Date after"),
+        widget=DatePicker,
+    )
+    expiration_date_before = forms.DateField(
+        required=False,
+        label=_("Expiration Date before"),
+        widget=DatePicker,
+    )
+    domain_status = forms.MultipleChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrant"),
     )
     admin_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Administrative Contact"),
     )
     tech_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Technical Contact"),
     )
     billing_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Billing Contact"),
     )
     tag = TagFilterField(Zone)
@@ -638,6 +680,11 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("Registry Domain ID"),
     )
+    domain_status = CSVChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
@@ -713,6 +760,8 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
             "rfc2317_parent_managed",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -846,6 +895,16 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Registry Domain ID"),
     )
+    expiration_date = forms.DateField(
+        required=False,
+        label=_("Expiration Date"),
+        widget=DatePicker,
+    )
+    domain_status = forms.ChoiceField(
+        choices=add_blank_choice(ZoneEPPStatusChoices),
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant = DynamicModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
@@ -913,6 +972,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -927,6 +988,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "nameservers",
         "rfc2317_prefix",
         "registrar",
+        "expiration_date",
+        "domain_status",
         "registry_domain_id",
         "registrant",
         "admin_c",

netbox_dns/forms/zone_template.py

@@ -127,11 +127,13 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Nameservers"),
     )
     soa_mname_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("MName"),
     )
     soa_rname = forms.CharField(
@@ -141,6 +143,7 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     record_template_id = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Record Templates"),
     )
     description = forms.CharField(
@@ -149,31 +152,37 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     dnssec_policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("DNSSEC Policy ID"),
     )
     registrar_id = DynamicModelMultipleChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrar"),
     )
     registrant_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrant"),
     )
     admin_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Administrative Contact"),
     )
     tech_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Technical Contact"),
     )
     billing_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Billing Contact"),
     )
     tag = TagFilterField(ZoneTemplate)

netbox_dns/graphql/types.py

@@ -214,6 +214,7 @@ class NetBoxDNSDNSSECPolicyType(NetBoxObjectType):
     cds_digest_types: List[str]
     parent_ds_ttl: BigInt | None
     parent_propagation_delay: BigInt | None
+    parental_agents: List[str]
     use_nsec3: bool
     nsec3_iterations: BigInt | None
     nsec3_opt_out: bool

netbox_dns/migrations/0018_zone_domain_status_zone_expiration_date.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.7 on 2025-04-03 13:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0017_dnssec_policy_zone_zone_template"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zone",
+            name="domain_status",
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name="zone",
+            name="expiration_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

netbox_dns/migrations/0019_dnssecpolicy_parental_agents.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2 on 2025-04-22 18:05
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0018_zone_domain_status_zone_expiration_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dnssecpolicy",
+            name="parental_agents",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.GenericIPAddressField(),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

netbox_dns/models/dnssec_policy.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.urls import reverse
+from django.contrib.postgres.fields import ArrayField
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -117,6 +118,14 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
+    parental_agents = ArrayField(
+        base_field=models.GenericIPAddressField(
+            protocol="both",
+        ),
+        blank=True,
+        null=True,
+        default=list,
+    )
 
     use_nsec3 = models.BooleanField(
         verbose_name=_("Use NSEC3"),
@@ -181,16 +190,18 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
         return self.publish_safety if self.publish_safety is not None else 3600
 
     def get_effective_value(self, attribute):
-        default_value = get_plugin_config("netbox_dns", f"dnssec_{attribute}", None)
-
         if not hasattr(self, attribute):
             raise AttributeError(f"DNSSECPolicy does not have attribute {attribute}")
 
         if (value := getattr(self, attribute)) is None:
-            return default_value
+            return self.get_fallback_setting(attribute)
 
         return value
 
+    @classmethod
+    def get_fallback_setting(cls, attribute):
+        return get_plugin_config("netbox_dns", f"dnssec_{attribute}")
+
 
 @register_search
 class DNSSECPolicyIndex(SearchIndex):

netbox_dns/models/record.py

@@ -167,7 +167,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         default=False,
     )
     ptr_record = models.OneToOneField(
-        verbose_name="PTR Record",
+        verbose_name=_("PTR Record"),
         to="self",
         on_delete=models.SET_NULL,
         related_name="address_record",
@@ -649,6 +649,9 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     @property
     def absolute_value(self):
+        if self.type in RecordTypeChoices.CUSTOM_TYPES:
+            return self.value
+
         zone = dns_name.from_text(self.zone.name)
         rr = rdata.from_text(RecordClassChoices.IN, self.type, self.value)
 

netbox_dns/models/zone.py

@@ -1,6 +1,6 @@
 import re
 from math import ceil
-from datetime import datetime
+from datetime import datetime, date
 
 from dns import name as dns_name
 from dns.exception import DNSException
@@ -26,7 +26,12 @@ from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
 from ipam.models import IPAddress
 
-from netbox_dns.choices import RecordClassChoices, RecordTypeChoices, ZoneStatusChoices
+from netbox_dns.choices import (
+    RecordClassChoices,
+    RecordTypeChoices,
+    ZoneStatusChoices,
+    ZoneEPPStatusChoices,
+)
 from netbox_dns.fields import NetworkField, RFC2317NetworkField
 from netbox_dns.utilities import (
     update_dns_records,
@@ -202,6 +207,18 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
+    expiration_date = models.DateField(
+        verbose_name=_("Expiration Date"),
+        blank=True,
+        null=True,
+    )
+    domain_status = models.CharField(
+        verbose_name=_("Domain Status"),
+        max_length=50,
+        choices=ZoneEPPStatusChoices,
+        blank=True,
+        null=True,
+    )
     registrant = models.ForeignKey(
         verbose_name=_("Registrant"),
         to="RegistrationContact",
@@ -211,7 +228,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
     admin_c = models.ForeignKey(
-        verbose_name="Administrative Contact",
+        verbose_name=_("Administrative Contact"),
         to="RegistrationContact",
         on_delete=models.SET_NULL,
         related_name="admin_c_zones",
@@ -288,6 +305,23 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "tenant",
     )
 
+    soa_clean_fields = {
+        "description",
+        "status",
+        "dnssec_policy",
+        "inline_signing",
+        "registrar",
+        "registry_domain_id",
+        "expiration_date",
+        "domain_status",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "rfc2317_parent_managed",
+        "tenant",
+    }
+
     class Meta:
         verbose_name = _("Zone")
         verbose_name_plural = _("Zones")
@@ -370,6 +404,9 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_status_color(self):
         return ZoneStatusChoices.colors.get(self.status)
 
+    def get_domain_status_color(self):
+        return ZoneEPPStatusChoices.colors.get(self.domain_status)
+
     # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:zone", kwargs={"pk": self.pk})
@@ -410,6 +447,8 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 self.admin_c,
                 self.tech_c,
                 self.billing_c,
+                self.expiration_date,
+                self.domain_status,
             )
         )
 
@@ -579,6 +618,26 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         return ns_warnings, ns_errors
 
+    def check_expiration(self):
+        if self.expiration_date is None:
+            return None, None
+
+        expiration_warning = None
+        expiration_error = None
+
+        expiration_warning_days = get_plugin_config(
+            "netbox_dns", "zone_expiration_warning_days"
+        )
+
+        if self.expiration_date < date.today():
+            expiration_error = _("The registration for this domain has expired.")
+        elif (self.expiration_date - date.today()).days < expiration_warning_days:
+            expiration_warning = _(
+                f"The registration for his domain will expire less than {expiration_warning_days} days."
+            )
+
+        return expiration_warning, expiration_error
+
     def check_soa_serial_increment(self, old_serial, new_serial):
         MAX_SOA_SERIAL_INCREMENT = 2**31 - 1
         SOA_SERIAL_WRAP = 2**32
@@ -870,7 +929,9 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         changed_fields = self.changed_fields
 
-        if self.soa_serial_auto:
+        if self.soa_serial_auto and (
+            changed_fields is None or changed_fields - self.soa_clean_fields
+        ):
             self.soa_serial = self.get_auto_serial()
 
         super().save(*args, **kwargs)

netbox_dns/models/zone_template.py

@@ -139,7 +139,7 @@ class ZoneTemplate(NetBoxModel):
 
     class Meta:
         verbose_name = _("Zone Template")
-        verbose_name_plural = "Zone Templates"
+        verbose_name_plural = _("Zone Templates")
 
         ordering = ("name",)
 

netbox_dns/tables/zone.py

@@ -38,7 +38,7 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
         url_name="plugins:netbox_dns:zone_list",
     )
     default_ttl = tables.Column(
-        verbose_name="Default TTL",
+        verbose_name=_("Default TTL"),
     )
     dnssec_policy = tables.Column(
         verbose_name=_("DNSSEC Policy"),
@@ -55,6 +55,9 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name=_("Registrar"),
         linkify=True,
     )
+    domain_status = ChoiceFieldColumn(
+        verbose_name=_("Domain Status"),
+    )
     registrant = tables.Column(
         verbose_name=_("Registrant"),
         linkify=True,
@@ -84,6 +87,8 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
             "inline_signing",
             "rfc2317_parent_managed",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
         )
         default_columns = (
             "name",

netbox_dns/template_content.py

@@ -2,6 +2,7 @@ import django_tables2 as tables
 
 from django.conf import settings
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 from netbox.plugins.utils import get_plugin_config
 from netbox.plugins import PluginTemplateExtension
@@ -119,7 +120,7 @@ class IPRelatedDNSRecords(PluginTemplateExtension):
 
 
 address_records = tables.ManyToManyColumn(
-    verbose_name="DNS Address Records",
+    verbose_name=_("DNS Address Records"),
     accessor="netbox_dns_records",
     linkify_item=True,
     transform=lambda obj: (

netbox_dns/templates/netbox_dns/dnssecpolicy.html

@@ -118,6 +118,16 @@
                         <th scope="row">{% trans "Parent Propagation Delay" %}</th>
                         <td>{{ object.parent_propagation_delay|placeholder }}</td>
                     </tr>
+                    <tr>
+                        <th scope="row">{% trans "Parental Agents" %}</th>
+                        <td>
+                            <table>
+                                {% for parental_agent in object.parental_agents %}
+                                <tr><td>{{ parental_agent }}</td></tr>
+                                {% endfor %}
+                            </table>
+                        </td>
+                    </tr>
                 </table>
             </div>
             <div class="card">

netbox_dns/templates/netbox_dns/zone/registration.html

@@ -14,6 +14,25 @@
             <th scope="row">{% trans "Registry Domain ID" %}</th>
             <td>{{ object.registry_domain_id|placeholder }}</td>
         </tr>
+        <tr>
+            <th scope="row">{% trans "Expiration Date" %}</th>
+            <td>{{ object.expiration_date|placeholder }}</td>
+        </tr>
+        {% if expiration_warning %}
+            <tr>
+                <th class="text-warning" scope="row">{% trans "Warning" %}</th>
+                <td class="text-warning">{{ expiration_warning }}</td>
+            </tr>
+        {% elif expiration_error %}
+            <tr>
+                <th class="text-danger" scope="row">{% trans "Error" %}</th>
+                <td class="text-danger">{{ expiration_error }}</td>
+            </tr>
+        {% endif %}
+        <tr>
+            <th scope="row">{% trans "Domain Status" %}</th>
+            <td>{% badge object.get_domain_status_display bg_color=object.get_domain_status_color %}</td>
+        </tr>
         <tr>
             <th scope="row">{% trans "Registrant" %}</th>
             <td>{{ object.registrant|linkify|placeholder }}</td>

netbox_dns/urls.py

@@ -2,6 +2,13 @@ from django.urls import include, path
 
 from utilities.urls import get_model_urls
 
+# +
+# Import views so the register_model_view is run. This is required for the
+# URLs to be set up properly with get_model_urls().
+# -
+from .views import *  # noqa: F401
+
+
 app_name = "netbox_dns"
 
 urlpatterns = (