netbox-plugin-dns 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

netbox_dns/templates/netbox_dns/view.html

@@ -5,7 +5,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">{% trans "View" context "DNS" %}</h5>
+                <h5 class="card-header">{% trans "View" %}</h5>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">{% trans "Name" %}</th>

netbox_dns/templates/netbox_dns/zone/delegation_record.html

@@ -0,0 +1,18 @@
+{% extends 'netbox_dns/zone/base.html' %}
+{% load helpers %}
+{% load render_table from django_tables2 %}
+{% load perms %}
+
+{% block content %}
+    {% include 'inc/table_controls_htmx.html' with table_modal="DelegationRecordTable_config" %}
+    <div class="card">
+        <div class="htmx-container table-responsive" id="object_list">
+            {% include 'htmx/table.html' %}
+        </div>
+    </div>
+{% endblock %}
+
+{% block modals %}
+    {{ block.super }}
+    {% table_config_form table %}
+{% endblock modals %}

netbox_dns/templates/netbox_dns/zone.html

@@ -25,7 +25,7 @@
                     </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">{% trans "View" context "DNS" %}</th>
+                    <th scope="row">{% trans "View" %}</th>
                     <td>{{ object.view|linkify }}</td>
                 </tr>
                 {% if object.description %}

netbox_dns/utilities/__init__.py

@@ -1,2 +1,3 @@
+from .dns import *
 from .conversions import *
 from .ipam_dnssync import *

netbox_dns/utilities/dns.py

@@ -0,0 +1,12 @@
+from dns import name as dns_name
+
+
+__all__ = ("get_parent_zone_names",)
+
+
+def get_parent_zone_names(name, min_labels=1, include_self=False):
+    fqdn = dns_name.from_text(name)
+    return [
+        fqdn.split(i)[1].to_text().rstrip(".")
+        for i in range(min_labels + 1, len(fqdn.labels) + include_self)
+    ]

netbox_dns/utilities/ipam_dnssync.py

@@ -12,6 +12,8 @@ from ipam.models import IPAddress, Prefix
 
 from netbox_dns.choices import RecordStatusChoices
 
+from .dns import get_parent_zone_names
+
 
 __all__ = (
     "get_zones",
@@ -85,15 +87,12 @@ def get_zones(ip_address, view=None, old_zone=None):
     min_labels = settings.PLUGINS_CONFIG["netbox_dns"].get(
         "dnssync_minimum_zone_labels", 2
     )
-    fqdn = dns_name.from_text(ip_address.dns_name)
-    zone_name_candidates = [
-        fqdn.split(i)[1].to_text().rstrip(".")
-        for i in range(min_labels + 1, len(fqdn.labels) + 1)
-    ]
 
     zones = Zone.objects.filter(
         view__in=views,
-        name__in=zone_name_candidates,
+        name__in=get_parent_zone_names(
+            ip_address.dns_name, min_labels=min_labels, include_self=True
+        ),
         active=True,
     )
 
@@ -194,9 +193,7 @@ def update_dns_records(ip_address, view=None, force=False):
                     updated = True
 
         zones = Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
-            pk__in=set(
-                ip_address.netbox_dns_records.all().values_list("zone", flat=True)
-            )
+            pk__in=set(ip_address.netbox_dns_records.values_list("zone", flat=True))
         )
 
     for zone in zones:
@@ -213,18 +210,18 @@ def update_dns_records(ip_address, view=None, force=False):
 
 
 def delete_dns_records(ip_address, view=None):
-    deleted = False
-
     if view is None:
         address_records = ip_address.netbox_dns_records.all()
     else:
         address_records = ip_address.netbox_dns_records.filter(zone__view=view)
 
+    if not address_records.exists():
+        return False
+
     for record in address_records:
         record.delete()
-        deleted = True
 
-    return deleted
+    return True
 
 
 def get_views_by_prefix(prefix):

netbox_dns/views/nameserver.py

@@ -36,7 +36,7 @@ class NameServerListView(generic.ObjectListView):
 
 
 class NameServerView(generic.ObjectView):
-    queryset = NameServer.objects.all().prefetch_related("zones")
+    queryset = NameServer.objects.prefetch_related("zones")
 
     def get_extra_context(self, request, instance):
         name = dns_name.from_text(instance.name)
@@ -85,7 +85,7 @@ class NameServerContactsView(ObjectContactsView):
 
 @register_model_view(NameServer, "zones")
 class NameServerZoneListView(generic.ObjectChildrenView):
-    queryset = NameServer.objects.all().prefetch_related("zones")
+    queryset = NameServer.objects.prefetch_related("zones")
     child_model = Zone
     table = ZoneTable
     filterset = ZoneFilterSet
@@ -105,7 +105,7 @@ class NameServerZoneListView(generic.ObjectChildrenView):
 
 @register_model_view(NameServer, "soa_zones")
 class NameServerSOAZoneListView(generic.ObjectChildrenView):
-    queryset = NameServer.objects.all().prefetch_related("zones_soa")
+    queryset = NameServer.objects.prefetch_related("soa_zones")
     child_model = Zone
     table = ZoneTable
     filterset = ZoneFilterSet
@@ -115,9 +115,9 @@ class NameServerSOAZoneListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("SOA Zones"),
         permission="netbox_dns.view_zone",
-        badge=lambda obj: obj.zones_soa.count(),
+        badge=lambda obj: obj.soa_zones.count(),
         hide_if_empty=True,
     )
 
     def get_children(self, request, parent):
-        return parent.zones_soa
+        return parent.soa_zones

netbox_dns/views/record.py

@@ -1,5 +1,7 @@
 from dns import name as dns_name
 
+from django.utils.translation import gettext_lazy as _
+
 from netbox.views import generic
 from utilities.views import register_model_view
 from tenancy.views import ObjectContactsView
@@ -14,7 +16,7 @@ from netbox_dns.forms import (
 from netbox_dns.models import Record, Zone
 from netbox_dns.choices import RecordTypeChoices
 from netbox_dns.tables import RecordTable, ManagedRecordTable, RelatedRecordTable
-from netbox_dns.utilities import value_to_unicode
+from netbox_dns.utilities import value_to_unicode, get_parent_zone_names
 
 
 __all__ = (
@@ -29,6 +31,10 @@ __all__ = (
 )
 
 
+class CNAMEWarning(Exception):
+    pass
+
+
 class RecordListView(generic.ObjectListView):
     queryset = Record.objects.filter(managed=False).prefetch_related(
         "zone", "ptr_record"
@@ -50,7 +56,7 @@ class ManagedRecordListView(generic.ObjectListView):
 
 
 class RecordView(generic.ObjectView):
-    queryset = Record.objects.all().prefetch_related("zone", "ptr_record")
+    queryset = Record.objects.prefetch_related("zone", "ptr_record")
 
     def get_value_records(self, instance):
         value_fqdn = dns_name.from_text(instance.value_fqdn)
@@ -64,6 +70,18 @@ class RecordView(generic.ObjectView):
                 data=cname_targets,
             )
 
+        if instance.zone.view.zones.filter(
+            name__in=get_parent_zone_names(instance.value_fqdn, min_labels=1),
+            active=True,
+        ).exists():
+            raise (
+                CNAMEWarning(
+                    _(
+                        "There is no matching target record for CNAME value {value}"
+                    ).format(value=instance.value_fqdn)
+                )
+            )
+
         return None
 
     def get_cname_records(self, instance):
@@ -75,14 +93,8 @@ class RecordView(generic.ObjectView):
             )
         )
 
-        fqdn = dns_name.from_text(instance.fqdn)
-        parent_zone_names = [
-            fqdn.split(length)[1].to_text().rstrip(".")
-            for length in range(1, len(fqdn) + 1)
-        ]
-
-        parent_zones = Zone.objects.filter(
-            view=instance.zone.view, name__in=parent_zone_names
+        parent_zones = instance.zone.view.zones.filter(
+            name__in=get_parent_zone_names(instance.fqdn, include_self=True),
         )
 
         for parent_zone in parent_zones:
@@ -118,10 +130,31 @@ class RecordView(generic.ObjectView):
             context["unicode_value"] = unicode_value
 
         if instance.type == RecordTypeChoices.CNAME:
-            context["cname_target_table"] = self.get_value_records(instance)
+            try:
+                context["cname_target_table"] = self.get_value_records(instance)
+            except CNAMEWarning as exc:
+                context["cname_warning"] = str(exc)
         else:
             context["cname_table"] = self.get_cname_records(instance)
 
+        if not instance.managed:
+            name = dns_name.from_text(instance.name, origin=None)
+
+            if not instance.is_delegation_record:
+                fqdn = dns_name.from_text(instance.fqdn)
+
+                if Zone.objects.filter(
+                    active=True,
+                    name__in=get_parent_zone_names(
+                        instance.fqdn,
+                        min_labels=len(fqdn) - len(name),
+                        include_self=True,
+                    ),
+                ).exists():
+                    context["mask_warning"] = _(
+                        "Record is masked by a child zone and may not be visible in DNS"
+                    )
+
         return context
 
 

netbox_dns/views/registrar.py

@@ -69,7 +69,7 @@ class RegistrarBulkDeleteView(generic.BulkDeleteView):
 
 @register_model_view(Registrar, "zones")
 class RegistrarZoneListView(generic.ObjectChildrenView):
-    queryset = Registrar.objects.all().prefetch_related("zone_set")
+    queryset = Registrar.objects.prefetch_related("zones")
     child_model = Zone
     table = ZoneTable
     filterset = ZoneFilterSet
@@ -79,9 +79,9 @@ class RegistrarZoneListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("Zones"),
         permission="netbox_dns.view_zone",
-        badge=lambda obj: obj.zone_set.count(),
+        badge=lambda obj: obj.zones.count(),
         hide_if_empty=True,
     )
 
     def get_children(self, request, parent):
-        return parent.zone_set
+        return parent.zones

netbox_dns/views/registration_contact.py

@@ -70,8 +70,8 @@ class RegistrationContactBulkDeleteView(generic.BulkDeleteView):
 
 @register_model_view(RegistrationContact, "zones")
 class RegistrationContactZoneListView(generic.ObjectChildrenView):
-    queryset = RegistrationContact.objects.all().prefetch_related(
-        "zone_set", "admin_c_zones", "tech_c_zones", "billing_c_zones"
+    queryset = RegistrationContact.objects.prefetch_related(
+        "registrant_zones", "admin_c_zones", "tech_c_zones", "billing_c_zones"
     )
     child_model = Zone
     table = ZoneTable

netbox_dns/views/view.py

@@ -31,7 +31,7 @@ __all__ = (
 
 
 class ViewView(generic.ObjectView):
-    queryset = View.objects.all().prefetch_related("zone_set")
+    queryset = View.objects.prefetch_related("zones")
 
 
 class ViewListView(generic.ObjectListView):
@@ -89,7 +89,7 @@ class ViewPrefixEditView(generic.ObjectEditView):
 
 @register_model_view(View, "zones")
 class ViewZoneListView(generic.ObjectChildrenView):
-    queryset = View.objects.all().prefetch_related("zone_set")
+    queryset = View.objects.prefetch_related("zones")
     child_model = Zone
     table = ZoneTable
     filterset = ZoneFilterSet
@@ -99,12 +99,12 @@ class ViewZoneListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("Zones"),
         permission="netbox_dns.view_zone",
-        badge=lambda obj: obj.zone_set.count(),
+        badge=lambda obj: obj.zones.count(),
         hide_if_empty=True,
     )
 
     def get_children(self, request, parent):
-        return parent.zone_set
+        return parent.zones
 
 
 @register_model_view(View, "contacts")

netbox_dns/views/zone.py

@@ -18,6 +18,7 @@ from netbox_dns.tables import (
     ZoneTable,
     RecordTable,
     ManagedRecordTable,
+    DelegationRecordTable,
 )
 
 
@@ -33,19 +34,19 @@ __all__ = (
 
 
 class ZoneListView(generic.ObjectListView):
-    queryset = Zone.objects.all().prefetch_related("view", "tags")
+    queryset = Zone.objects.prefetch_related("view", "tags")
     filterset = ZoneFilterSet
     filterset_form = ZoneFilterForm
     table = ZoneTable
 
 
 class ZoneView(generic.ObjectView):
-    queryset = Zone.objects.all().prefetch_related(
+    queryset = Zone.objects.prefetch_related(
         "view",
         "tags",
         "nameservers",
         "soa_mname",
-        "record_set",
+        "records",
     )
 
     def get_extra_context(self, request, instance):
@@ -65,9 +66,7 @@ class ZoneView(generic.ObjectView):
 
 
 class ZoneEditView(generic.ObjectEditView):
-    queryset = Zone.objects.all().prefetch_related(
-        "view", "tags", "nameservers", "soa_mname"
-    )
+    queryset = Zone.objects.prefetch_related("view", "tags", "nameservers", "soa_mname")
     form = ZoneForm
     default_return_url = "plugins:netbox_dns:zone_list"
 
@@ -78,18 +77,14 @@ class ZoneDeleteView(generic.ObjectDeleteView):
 
 
 class ZoneBulkImportView(generic.BulkImportView):
-    queryset = Zone.objects.all().prefetch_related(
-        "view", "tags", "nameservers", "soa_mname"
-    )
+    queryset = Zone.objects.prefetch_related("view", "tags", "nameservers", "soa_mname")
     model_form = ZoneImportForm
     table = ZoneTable
     default_return_url = "plugins:netbox_dns:zone_list"
 
 
 class ZoneBulkEditView(generic.BulkEditView):
-    queryset = Zone.objects.all().prefetch_related(
-        "view", "tags", "nameservers", "soa_mname"
-    )
+    queryset = Zone.objects.prefetch_related("view", "tags", "nameservers", "soa_mname")
     filterset = ZoneFilterSet
     table = ZoneTable
     form = ZoneBulkEditForm
@@ -131,14 +126,12 @@ class ZoneRecordListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("Records"),
         permission="netbox_dns.view_record",
-        badge=lambda obj: obj.record_count(managed=False),
+        badge=lambda obj: obj.records.filter(managed=False).count(),
         hide_if_empty=True,
     )
 
     def get_children(self, request, parent):
-        return Record.objects.restrict(request.user, "view").filter(
-            zone=parent, managed=False
-        )
+        return parent.records.restrict(request.user, "view").filter(managed=False)
 
 
 @register_model_view(Zone, "managed_records")
@@ -153,14 +146,50 @@ class ZoneManagedRecordListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("Managed Records"),
         permission="netbox_dns.view_record",
-        badge=lambda obj: obj.record_count(managed=True),
+        badge=lambda obj: obj.records.filter(managed=True).count(),
+        hide_if_empty=True,
+    )
+
+    def get_children(self, request, parent):
+        return parent.records.restrict(request.user, "view").filter(managed=True)
+
+
+@register_model_view(Zone, "delegation_records")
+class ZoneDelegationRecordListView(generic.ObjectChildrenView):
+    queryset = Zone.objects.all()
+    child_model = Record
+    table = DelegationRecordTable
+    filterset = RecordFilterSet
+    template_name = "netbox_dns/zone/delegation_record.html"
+
+    tab = ViewTab(
+        label=_("Delegation Records"),
+        permission="netbox_dns.view_record",
+        badge=lambda obj: obj.delegation_records.count(),
+        hide_if_empty=True,
+    )
+
+    def get_children(self, request, parent):
+        return parent.delegation_records.restrict(request.user, "view")
+
+
+@register_model_view(Zone, "parent_delegation_records")
+class ZoneParentDelegationRecordListView(generic.ObjectChildrenView):
+    queryset = Zone.objects.all()
+    child_model = Record
+    table = DelegationRecordTable
+    filterset = RecordFilterSet
+    template_name = "netbox_dns/zone/delegation_record.html"
+
+    tab = ViewTab(
+        label=_("Parent Delegation Records"),
+        permission="netbox_dns.view_record",
+        badge=lambda obj: obj.ancestor_delegation_records.count(),
         hide_if_empty=True,
     )
 
     def get_children(self, request, parent):
-        return Record.objects.restrict(request.user, "view").filter(
-            zone=parent, managed=True
-        )
+        return parent.ancestor_delegation_records.restrict(request.user, "view")
 
 
 @register_model_view(Zone, "rfc2317_child_zones")
@@ -174,7 +203,7 @@ class ZoneRFC2317ChildZoneListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("RFC2317 Child Zones"),
         permission="netbox_dns.view_zone",
-        badge=lambda obj: obj.rfc2317_child_zone_count(),
+        badge=lambda obj: obj.rfc2317_child_zones.count(),
         hide_if_empty=True,
     )
 

{netbox_plugin_dns-1.1.4.dist-info → netbox_plugin_dns-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.4
+Version: 1.1.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
@@ -25,6 +25,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://github.com/peteeckel/netbox-plugin-dns/pulls"><img src="https://img.shields.io/github/issues-pr/peteeckel/netbox-plugin-dns" alt="Pull Requests Badge"/></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/graphs/contributors"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/peteeckel/netbox-plugin-dns?color=2b9348"></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/blob/master/LICENSE"><img src="https://img.shields.io/github/license/peteeckel/netbox-plugin-dns?color=2b9348" alt="License Badge"/></a>
+<a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style Black"/></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads" src="https://static.pepy.tech/badge/netbox-plugin-dns"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Week" src="https://static.pepy.tech/badge/netbox-plugin-dns/month"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>