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

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,
@@ -97,6 +102,11 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         max_length=255,
         db_collation="natural_sort",
     )
+    description = models.CharField(
+        verbose_name=_("Description"),
+        max_length=200,
+        blank=True,
+    )
     status = models.CharField(
         verbose_name=_("Status"),
         max_length=50,
@@ -170,25 +180,19 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         help_text=_("Automatically generate the SOA serial number"),
         default=True,
     )
-    description = models.CharField(
-        verbose_name=_("Description"),
-        max_length=200,
-        blank=True,
-    )
-    arpa_network = NetworkField(
-        verbose_name=_("ARPA Network"),
-        help_text=_("Network related to a reverse lookup zone (.arpa)"),
-        blank=True,
-        null=True,
-    )
-    tenant = models.ForeignKey(
-        verbose_name=_("Tenant"),
-        to="tenancy.Tenant",
+    dnssec_policy = models.ForeignKey(
+        verbose_name=_("DNSSEC Policy"),
+        to="DNSSECPolicy",
         on_delete=models.PROTECT,
-        related_name="netbox_dns_zones",
+        related_name="zones",
         blank=True,
         null=True,
     )
+    inline_signing = models.BooleanField(
+        verbose_name=_("Inline Signing"),
+        help_text=_("Use inline signing for DNSSEC"),
+        default=True,
+    )
     registrar = models.ForeignKey(
         verbose_name=_("Registrar"),
         to="Registrar",
@@ -203,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",
@@ -212,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",
@@ -255,12 +271,27 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
+    arpa_network = NetworkField(
+        verbose_name=_("ARPA Network"),
+        help_text=_("Network related to a reverse lookup zone (.arpa)"),
+        blank=True,
+        null=True,
+    )
+    tenant = models.ForeignKey(
+        verbose_name=_("Tenant"),
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="netbox_dns_zones",
+        blank=True,
+        null=True,
+    )
 
     objects = ZoneManager()
 
     clone_fields = (
         "view",
         "name",
+        "description",
         "status",
         "nameservers",
         "default_ttl",
@@ -271,7 +302,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "soa_retry",
         "soa_expire",
         "soa_minimum",
-        "description",
         "tenant",
     )
 
@@ -357,6 +387,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})
@@ -397,6 +430,8 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 self.admin_c,
                 self.tech_c,
                 self.billing_c,
+                self.expiration_date,
+                self.domain_status,
             )
         )
 
@@ -566,6 +601,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

netbox_dns/models/zone_template.py

@@ -55,11 +55,11 @@ class ZoneTemplate(NetBoxModel):
         related_name="zone_templates",
         blank=True,
     )
-    tenant = models.ForeignKey(
-        verbose_name=_("Tenant"),
-        to="tenancy.Tenant",
+    dnssec_policy = models.ForeignKey(
+        verbose_name=_("DNSSEC Policy"),
+        to="DNSSECPolicy",
         on_delete=models.SET_NULL,
-        related_name="+",
+        related_name="zone_templates",
         blank=True,
         null=True,
     )
@@ -103,33 +103,43 @@ class ZoneTemplate(NetBoxModel):
         blank=True,
         null=True,
     )
+    tenant = models.ForeignKey(
+        verbose_name=_("Tenant"),
+        to="tenancy.Tenant",
+        on_delete=models.SET_NULL,
+        related_name="+",
+        blank=True,
+        null=True,
+    )
 
     clone_fields = (
         "description",
         "nameservers",
         "record_templates",
-        "tenant",
+        "dnssec_policy",
         "registrar",
         "registrant",
         "admin_c",
         "tech_c",
         "billing_c",
+        "tenant",
     )
 
     template_fields = (
         "soa_mname",
         "soa_rname",
-        "tenant",
+        "dnssec_policy",
         "registrar",
         "registrant",
         "admin_c",
         "tech_c",
         "billing_c",
+        "tenant",
     )
 
     class Meta:
         verbose_name = _("Zone Template")
-        verbose_name_plural = "Zone Templates"
+        verbose_name_plural = _("Zone Templates")
 
         ordering = ("name",)
 

netbox_dns/navigation.py

@@ -92,6 +92,46 @@ managed_record_menu_item = PluginMenuItem(
     permissions=["netbox_dns.view_record"],
 )
 
+dnsseckeytemplate_menu_item = PluginMenuItem(
+    link="plugins:netbox_dns:dnsseckeytemplate_list",
+    link_text=_("DNSSEC Key Templates"),
+    permissions=["netbox_dns.view_dnsseckeytemplate"],
+    buttons=(
+        PluginMenuButton(
+            "plugins:netbox_dns:dnsseckeytemplate_add",
+            _("Add"),
+            "mdi mdi-plus-thick",
+            permissions=["netbox_dns.add_dnsseckeytemplate"],
+        ),
+        PluginMenuButton(
+            "plugins:netbox_dns:dnsseckeytemplate_bulk_import",
+            _("Import"),
+            "mdi mdi-upload",
+            permissions=["netbox_dns.add_dnsseckeytemplate"],
+        ),
+    ),
+)
+
+dnssecpolicy_menu_item = PluginMenuItem(
+    link="plugins:netbox_dns:dnssecpolicy_list",
+    link_text=_("DNSSEC Policies"),
+    permissions=["netbox_dns.view_dnssecpolicy"],
+    buttons=(
+        PluginMenuButton(
+            "plugins:netbox_dns:dnssecpolicy_add",
+            _("Add"),
+            "mdi mdi-plus-thick",
+            permissions=["netbox_dns.add_dnssecpolicy"],
+        ),
+        PluginMenuButton(
+            "plugins:netbox_dns:dnssecpolicy_bulk_import",
+            _("Import"),
+            "mdi mdi-upload",
+            permissions=["netbox_dns.add_dnssecpolicy"],
+        ),
+    ),
+)
+
 zonetemplate_menu_item = PluginMenuItem(
     link="plugins:netbox_dns:zonetemplate_list",
     link_text=_("Zone Templates"),
@@ -187,6 +227,13 @@ if top_level_menu:
                     managed_record_menu_item,
                 ),
             ),
+            (
+                _("DNSSEC"),
+                (
+                    dnsseckeytemplate_menu_item,
+                    dnssecpolicy_menu_item,
+                ),
+            ),
             (
                 _("Templates"),
                 (
@@ -211,6 +258,8 @@ else:
         nameserver_menu_item,
         record_menu_item,
         managed_record_menu_item,
+        dnsseckeytemplate_menu_item,
+        dnssecpolicy_menu_item,
         registrar_menu_item,
         contact_menu_item,
     )

netbox_dns/signals/dnssec.py

@@ -0,0 +1,32 @@
+from django.dispatch import receiver
+from django.db.models.signals import m2m_changed
+from django.core.exceptions import ValidationError
+
+from netbox.context import current_request
+from utilities.exceptions import AbortRequest
+
+from netbox_dns.validators import validate_key_template_assignment
+
+from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate
+
+
+@receiver(m2m_changed, sender=DNSSECPolicy.key_templates.through)
+def dnssec_policy_key_templates_changed(action, instance, pk_set, **kwargs):
+    request = current_request.get()
+
+    key_templates = instance.key_templates.all()
+    match action:
+        case "pre_remove":
+            key_templates = key_templates.exclude(pk__in=pk_set)
+        case "pre_add":
+            key_templates |= DNSSECKeyTemplate.objects.filter(pk__in=pk_set)
+        case _:
+            return
+
+    try:
+        validate_key_template_assignment(key_templates)
+    except ValidationError as exc:
+        if request is not None:
+            raise AbortRequest(exc)
+        else:
+            raise exc

netbox_dns/tables/__init__.py

@@ -6,3 +6,5 @@ from .registration_contact import *
 from .registrar import *
 from .zone_template import *
 from .record_template import *
+from .dnssec_key_template import *
+from .dnssec_policy import *

netbox_dns/tables/dnssec_key_template.py

@@ -0,0 +1,48 @@
+import django_tables2 as tables
+from django.utils.translation import gettext_lazy as _
+
+
+from netbox.tables import (
+    NetBoxTable,
+    ChoiceFieldColumn,
+    TagColumn,
+)
+from tenancy.tables import TenancyColumnsMixin
+
+from netbox_dns.models import DNSSECKeyTemplate
+
+
+__all__ = ("DNSSECKeyTemplateTable",)
+
+
+class DNSSECKeyTemplateTable(TenancyColumnsMixin, NetBoxTable):
+    name = tables.Column(
+        verbose_name=_("Name"),
+        linkify=True,
+    )
+    type = ChoiceFieldColumn(
+        verbose_name=_("Key Type"),
+    )
+    lifetime = tables.Column(
+        verbose_name=_("Lifetime"),
+    )
+    algorithm = ChoiceFieldColumn(
+        verbose_name=_("Algorithm"),
+    )
+    key_size = ChoiceFieldColumn(
+        verbose_name=_("Key Size"),
+    )
+    tags = TagColumn(
+        url_name="plugins:netbox_dns:dnsseckeytemplate_list",
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = DNSSECKeyTemplate
+        fields = ("description",)
+        default_columns = (
+            "name",
+            "type",
+            "algorithm",
+            "key_size",
+            "tags",
+        )

netbox_dns/tables/dnssec_policy.py

@@ -0,0 +1,131 @@
+import django_tables2 as tables
+from django.utils.translation import gettext_lazy as _
+
+
+from netbox.tables import (
+    NetBoxTable,
+    TagColumn,
+    ChoiceFieldColumn,
+    ActionsColumn,
+)
+from tenancy.tables import TenancyColumnsMixin
+
+from netbox_dns.models import DNSSECPolicy
+
+
+__all__ = (
+    "DNSSECPolicyTable",
+    "DNSSECPolicyDisplayTable",
+)
+
+
+class DNSSECPolicyTable(TenancyColumnsMixin, NetBoxTable):
+    name = tables.Column(
+        verbose_name=_("Name"),
+        linkify=True,
+    )
+    status = ChoiceFieldColumn(
+        verbose_name=_("Status"),
+    )
+    dnskey_ttl = tables.Column(
+        verbose_name=_("DNSKEY TTL"),
+    )
+    purge_keys = tables.Column(
+        verbose_name=_("Purge Keys"),
+    )
+    publish_safety = tables.Column(
+        verbose_name=_("Publish Safety"),
+    )
+    retire_safety = tables.Column(
+        verbose_name=_("Retire Safety"),
+    )
+    signatures_jitter = tables.Column(
+        verbose_name=_("Signatures Jitter"),
+    )
+    signatures_refresh = tables.Column(
+        verbose_name=_("Signatures Refresh"),
+    )
+    signatures_validity = tables.Column(
+        verbose_name=_("Signatures Validity"),
+    )
+    signatures_validity_dnskey = tables.Column(
+        verbose_name=_("Signatures Validity (DNSKEY)"),
+    )
+    max_zone_ttl = tables.Column(
+        verbose_name=_("Max Zone TTL"),
+    )
+    dnskey_ttl = tables.Column(
+        verbose_name=_("DNSKEY TTL"),
+    )
+    zone_propagation_delay = tables.Column(
+        verbose_name=_("Zone Propagation Delay"),
+    )
+    create_cdnskey = tables.BooleanColumn(
+        verbose_name=_("Create CDNSKEY"),
+    )
+    cds_digest_types = tables.Column(
+        verbose_name=_("CDS Digest Types"),
+    )
+    parent_ds_ttl = tables.Column(
+        verbose_name=_("Parent DS TTL"),
+    )
+    parent_propagation_delay = tables.Column(
+        verbose_name=_("Parent Propagation Delay"),
+    )
+    use_nsec3 = tables.BooleanColumn(
+        verbose_name=_("Use NSEC3"),
+    )
+    nsec3_iterations = tables.Column(
+        verbose_name=_("NSEC3 Iterations"),
+    )
+    nsec3_opt_out = tables.BooleanColumn(
+        verbose_name=_("NSEC3 Opt Out"),
+    )
+    nsec3_salt_size = tables.Column(
+        verbose_name=_("NSEC3 Salt Size"),
+    )
+    tags = TagColumn(
+        url_name="plugins:netbox_dns:dnssecpolicy_list",
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = DNSSECPolicy
+        fields = ("description",)
+        default_columns = (
+            "name",
+            "description",
+            "status",
+            "use_nsec3",
+            "tags",
+        )
+
+
+class DNSSECPolicyDisplayTable(TenancyColumnsMixin, NetBoxTable):
+    actions = ActionsColumn(actions="")
+
+    name = tables.Column(
+        verbose_name=_("Name"),
+        linkify=True,
+    )
+    status = ChoiceFieldColumn(
+        verbose_name=_("Status"),
+    )
+    create_cdnskey = tables.BooleanColumn(
+        verbose_name=_("Create CDNSKEY"),
+    )
+    use_nsec3 = tables.BooleanColumn(
+        verbose_name=_("Use NSEC3"),
+    )
+    tags = TagColumn(
+        url_name="plugins:netbox_dns:dnssecpolicy_list",
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = DNSSECPolicy
+        fields = ("description",)
+        default_columns = (
+            "name",
+            "description",
+            "status",
+            "tags",
+        )

netbox_dns/tables/zone.py

@@ -5,13 +5,17 @@ from netbox.tables import (
     ChoiceFieldColumn,
     NetBoxTable,
     TagColumn,
+    ActionsColumn,
 )
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import Zone
 
 
-__all__ = ("ZoneTable",)
+__all__ = (
+    "ZoneTable",
+    "ZoneDisplayTable",
+)
 
 
 class ZoneTable(TenancyColumnsMixin, NetBoxTable):
@@ -34,7 +38,11 @@ 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"),
+        linkify=True,
     )
     rfc2317_prefix = tables.Column(
         verbose_name=_("RFC2317 Prefix"),
@@ -47,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,
@@ -73,8 +84,11 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
             "description",
             "soa_rname",
             "soa_serial",
+            "inline_signing",
             "rfc2317_parent_managed",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
         )
         default_columns = (
             "name",
@@ -82,3 +96,10 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
             "status",
             "tags",
         )
+
+
+class ZoneDisplayTable(ZoneTable):
+    actions = ActionsColumn(actions=("changelog",))
+
+    class Meta(ZoneTable.Meta):
+        pass

netbox_dns/tables/zone_template.py

@@ -25,6 +25,10 @@ class ZoneTemplateTable(TenancyColumnsMixin, NetBoxTable):
     tags = TagColumn(
         url_name="plugins:netbox_dns:zonetemplate_list",
     )
+    dnssec_policy = tables.Column(
+        verbose_name=_("DNSSEC Policy"),
+        linkify=True,
+    )
     registrar = tables.Column(
         verbose_name=_("Registrar"),
         linkify=True,

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/dnsseckeytemplate.html

@@ -0,0 +1,70 @@
+{% extends 'generic/object.html' %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+    <div class="row">
+        <div class="col col-md-6">
+            <div class="card">
+                <h5 class="card-header">{% trans "DNSSEC Key" %}</h5>
+                <table class="table table-hover attr-table">
+                    <tr>
+                        <th scope="row">{% trans "Name" %}</th>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    {% if object.description %}
+                    <tr>
+                        <th scope="row">{% trans "Description" %}</th>
+                        <td style="word-break:break-all;">{{ object.description }}</td>
+                    </tr>
+                    {% endif %}
+                    <tr>
+                        <th scope="row">{% trans "Type" %}</th>
+                        <td>{% badge object.get_type_display bg_color=object.get_type_color %}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Lifetime" %}</th>
+                        <td>{{ object.lifetime|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Algorithm" %}</th>
+                        <td>{% badge object.get_algorithm_display %}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Key Size" %}</th>
+                        <td>{% badge object.get_key_size_display %}</td>
+                    </tr>
+                    {% if object.tenant %}
+                    <tr>
+                        <th scope="row">{% trans "Tenant" %}</th>
+                        <td>
+                            {% if object.tenant.group %}
+                                {{ object.tenant.group|linkify }} /
+                            {% endif %}
+                            {{ object.tenant|linkify|placeholder }}
+                        </td>
+                    </tr>
+                    {% endif %}
+                </table>
+            </div>
+            {% include 'inc/panels/custom_fields.html' %}
+        </div>
+        <div class="col col-md-6">
+            {% include 'inc/panels/tags.html' %}
+        </div>
+    </div>
+    {% if policy_table %}
+        <div class="col col-md-12">
+            <div class="card">
+                {% if policy_table.rows|length == 1 %}
+                    <h2 class="card-header">{% trans "Policy" %}</h2>
+                {% else %}
+                    <h2 class="card-header">{% trans "Policies" %}</h2>
+                {% endif %}
+                <div class="table-responsive">
+                    {% render_table policy_table 'inc/table.html' %}
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}