netbox-plugin-dns 1.0.2__tar.gz → 1.0.4__tar.gz

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.0.2
+Version: 1.0.4
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/__init__.py

@@ -1,6 +1,6 @@
 from netbox.plugins import PluginConfig
 
-__version__ = "1.0.2"
+__version__ = "1.0.4"
 
 
 class DNSConfig(PluginConfig):
@@ -21,7 +21,9 @@ class DNSConfig(PluginConfig):
         "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
         "feature_ipam_coupling": False,
-        "tolerate_underscores_in_hostnames": False,
+        "tolerate_characters_in_zone_labels": "",
+        "tolerate_underscores_in_labels": False,
+        "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0
         "tolerate_leading_underscore_types": [
             "TXT",
             "SRV",
@@ -30,6 +32,8 @@ class DNSConfig(PluginConfig):
         "enable_root_zones": False,
         "enforce_unique_records": True,
         "enforce_unique_rrset_ttl": True,
+        "menu_name": "NetBox DNS",
+        "top_level_menu": True,
     }
     base_url = "netbox-dns"
 

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/graphql/types.py

@@ -1,4 +1,4 @@
-from typing import Annotated
+from typing import Annotated, List
 
 import strawberry
 import strawberry_django
@@ -37,12 +37,11 @@ class NetBoxDNSZoneType(NetBoxObjectType):
     status: str
     active: bool
     view: Annotated["NetBoxDNSViewType", strawberry.lazy("netbox_dns.graphql.types")]
-    nameservers: (
+    nameservers: List[
         Annotated[
             "NetBoxDNSNameServerType", strawberry.lazy("netbox_dns.graphql.types")
         ]
-        | None
-    )
+    ]
     default_ttl: BigInt
     soa_ttl: BigInt
     soa_mname: Annotated[

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/models/record.py

@@ -22,7 +22,7 @@ from netbox_dns.utilities import (
 )
 from netbox_dns.validators import (
     validate_fqdn,
-    validate_extended_hostname,
+    validate_generic_name,
     validate_domain_name,
 )
 from netbox_dns.mixins import ObjectModificationMixin
@@ -494,7 +494,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
             "netbox_dns", "tolerate_non_rfc1035_types", default=[]
         ):
             try:
-                validate_extended_hostname(
+                validate_generic_name(
                     self.name,
                     (
                         self.type
@@ -541,8 +541,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
                     )
 
                 case (
-                    RecordTypeChoices.DNAME
-                    | RecordTypeChoices.NS
+                    RecordTypeChoices.NS
                     | RecordTypeChoices.HTTPS
                     | RecordTypeChoices.SRV
                     | RecordTypeChoices.SVCB
@@ -550,6 +549,12 @@ class Record(ObjectModificationMixin, NetBoxModel):
                     _validate_idn(rr.target)
                     validate_domain_name(rr.target.to_text(), always_tolerant=True)
 
+                case RecordTypeChoices.DNAME:
+                    _validate_idn(rr.target)
+                    validate_domain_name(
+                        rr.target.to_text(), always_tolerant=True, zone_name=True
+                    )
+
                 case RecordTypeChoices.PTR | RecordTypeChoices.NSAP_PTR:
                     _validate_idn(rr.target)
                     validate_fqdn(rr.target.to_text(), always_tolerant=True)
@@ -570,7 +575,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
 
                 case RecordTypeChoices.NAPTR:
                     _validate_idn(rr.replacement)
-                    validate_extended_hostname(
+                    validate_generic_name(
                         rr.replacement.to_text(), always_tolerant=True
                     )
 

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/models/zone.py

@@ -1,3 +1,4 @@
+import re
 from math import ceil
 from datetime import datetime
 
@@ -353,6 +354,22 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             )
         )
 
+    @property
+    def child_zones(self):
+        return Zone.objects.filter(
+            name__iregex=rf"^[^.]+\.{re.escape(self.name)}$", view=self.view
+        )
+
+    @property
+    def parent_zone(self):
+        parent_name = (
+            dns_name.from_text(self.name).parent().relativize(dns_name.root).to_text()
+        )
+        try:
+            return Zone.objects.get(name=parent_name, view=self.view)
+        except Zone.DoesNotExist:
+            return None
+
     def record_count(self, managed=False):
         return record.Record.objects.filter(zone=self, managed=managed).count()
 
@@ -593,7 +610,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             ) from None
 
         try:
-            validate_domain_name(self.name)
+            validate_domain_name(self.name, zone_name=True)
         except ValidationError as exc:
             raise ValidationError(
                 {

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/navigation.py

@@ -1,4 +1,8 @@
 from netbox.plugins import PluginMenuButton, PluginMenuItem, PluginMenu
+from netbox.plugins.utils import get_plugin_config
+
+menu_name = get_plugin_config("netbox_dns", "menu_name")
+top_level_menu = get_plugin_config("netbox_dns", "top_level_menu")
 
 view_menu_item = PluginMenuItem(
     link="plugins:netbox_dns:view_list",
@@ -126,26 +130,38 @@ contact_menu_item = PluginMenuItem(
     ),
 )
 
-menu = PluginMenu(
-    label="NetBox DNS",
-    groups=(
-        (
-            "DNS Configuration",
+
+if top_level_menu:
+    menu = PluginMenu(
+        label=menu_name,
+        groups=(
             (
-                view_menu_item,
-                zone_menu_item,
-                nameserver_menu_item,
-                record_menu_item,
-                managed_record_menu_item,
+                "DNS Configuration",
+                (
+                    view_menu_item,
+                    zone_menu_item,
+                    nameserver_menu_item,
+                    record_menu_item,
+                    managed_record_menu_item,
+                ),
             ),
-        ),
-        (
-            "Domain Registration",
             (
-                registrar_menu_item,
-                contact_menu_item,
+                "Domain Registration",
+                (
+                    registrar_menu_item,
+                    contact_menu_item,
+                ),
             ),
         ),
-    ),
-    icon_class="mdi mdi-dns",
-)
+        icon_class="mdi mdi-dns",
+    )
+else:
+    menu_items = (
+        view_menu_item,
+        zone_menu_item,
+        nameserver_menu_item,
+        record_menu_item,
+        managed_record_menu_item,
+        registrar_menu_item,
+        contact_menu_item,
+    )

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/templates/netbox_dns/record.html

@@ -94,25 +94,25 @@
                 {% if object.ptr_record %}
                 <tr>
                     <th scope="row">PTR Record</th>
-                    <td><a href="{% url 'plugins:netbox_dns:record' pk=object.ptr_record.pk %}">{{ object.ptr_record }}</td>
+                    <td>{{ object.ptr_record|linkify }}</td>
                 </tr>
                 {% endif %}
                 {% if object.address_record %}
                 <tr>
                     <th scope="row">Address Record</th>
-                    <td><a href="{% url 'plugins:netbox_dns:record' pk=object.address_record.pk %}">{{ object.address_record }}</td>
+                    <td>{{ object.address_record|linkify }}</td>
                 </tr>
                     {% if object.address_record.ipam_ip_address %}
                     <tr>
                         <th scope="row">IPAM IP Address</th>
-                        <td><a href="{% url 'ipam:ipaddress' pk=object.address_record.ipam_ip_address.pk %}">{{ object.address_record.ipam_ip_address }}</td>
+                        <td>{{ object.address_record.ipam_ip_address|linkify }}</td>
                     </tr>
                     {% endif %}
                 {% endif %}
                 {% if object.ipam_ip_address %}
                 <tr>
                     <th scope="row">IPAM IP Address</th>
-                    <td><a href="{% url 'ipam:ipaddress' pk=object.ipam_ip_address.pk %}">{{ object.ipam_ip_address }}</td>
+                    <td>{{ object.ipam_ip_address|linkify }}</td>
                 </tr>
                 {% endif %}
                 <tr>

netbox_plugin_dns-1.0.4/netbox_dns/templates/netbox_dns/zone/child_zone.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="ChildZoneTable_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_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/templates/netbox_dns/zone.html

@@ -20,13 +20,15 @@
                         <td>{{ unicode_name }}</td>
                     </tr>
                 {% endif %}
+                {% if parent_zone %}
+                    <tr>
+                        <th scope="row">Parent Zone</th>
+                        <td>{{ parent_zone|linkify }}</td>
+                    </tr>
+                {% endif %}
                 <tr>
                     <th scope="row">View</th>
-                    <td>
-                        <a href="{% url 'plugins:netbox_dns:view' pk=object.view.pk %}">
-                            {{ object.view }}
-                        </a>
-                    </td>
+                    <td>{{ object.view|linkify }}</td>
                 </tr>
                 {% if object.description %}
                 <tr>
@@ -52,13 +54,7 @@
                     <td>
                         <table>
                             {% for nameserver in object.nameservers.all %}
-                            <tr>
-                                <td>
-                                    <a href="{% url 'plugins:netbox_dns:nameserver' pk=nameserver.pk %}">
-                                        {{ nameserver }}
-                                    </a>
-                                </td>
-                            </tr>
+                            <tr><td>{{ nameserver|linkify }}</td></tr>
                             {% endfor %}
                         </table>
                     </td>
@@ -115,7 +111,7 @@
                 </tr>
                 <tr>
                     <th scope="row">MName</th>
-                    <td><a href="{% url 'plugins:netbox_dns:nameserver' pk=object.soa_mname.pk %}">{{ object.soa_mname }}</a></td>
+                    <td>{{ object.soa_mname|linkify }}</td>
                 </tr>
                 <tr>
                     <th scope="row">RName</th>
@@ -153,7 +149,7 @@
         {% if object.rfc2317_prefix %}
         <div class="card">
             <h5 class="card-header">RFC2317</h5>
-            <table class="table table-hover soa-table">
+            <table class="table table-hover attr-table">
                 <tr>
                     <th scope="row">Prefix</th>
                     <td>{{ object.rfc2317_prefix }}</td>
@@ -165,7 +161,7 @@
                 {% if object.rfc2317_parent_managed %}
                 <tr>
                     <th scope="row">Parent Zone</th>
-                    <td><a href="{% url 'plugins:netbox_dns:zone' pk=object.rfc2317_parent_zone.pk %}">{{ object.rfc2317_parent_zone }}</a></td>
+                    <td>{{ object.rfc2317_parent_zone|linkify }}</td>
                 </tr>
                 {% endif %}
             </table>

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/urls/zone.py

@@ -15,6 +15,7 @@ from netbox_dns.views import (
     ZoneManagedRecordListView,
     ZoneRegistrationView,
     ZoneRFC2317ChildZoneListView,
+    ZoneChildZoneListView,
 )
 
 zone_urlpatterns = [
@@ -37,6 +38,11 @@ zone_urlpatterns = [
         ZoneRFC2317ChildZoneListView.as_view(),
         name="zone_rfc2317_child_zones",
     ),
+    path(
+        "zones/<int:pk>/childzones/",
+        ZoneChildZoneListView.as_view(),
+        name="zone_child_zones",
+    ),
     path(
         "zones/<int:pk>/registration/",
         ZoneRegistrationView.as_view(),

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/utilities/__init__.py

@@ -21,7 +21,7 @@ def arpa_to_prefix(arpa_name):
 
         try:
             return IPNetwork(f"{address}/{mask}")
-        except AddrFormatError:
+        except (AddrFormatError, ValueError):
             return None
 
     elif name.endswith("ip6.arpa"):

netbox_plugin_dns-1.0.4/netbox_dns/validators/dns_name.py

@@ -0,0 +1,86 @@
+import re
+
+from django.core.exceptions import ValidationError
+
+from netbox.plugins.utils import get_plugin_config
+
+import logging
+
+
+def _get_label(tolerate_leading_underscores=False, always_tolerant=False):
+    tolerate_characters = re.escape(
+        get_plugin_config("netbox_dns", "tolerate_characters_in_zone_labels", "")
+    )
+    label_characters = rf"a-z0-9{tolerate_characters}"
+
+    if always_tolerant:
+        label = rf"[a-z0-9_][a-z0-9_-]*(?<![-_])"
+        zone_label = rf"[{label_characters}_][{label_characters}_-]*(?<![-_])"
+
+        return label, zone_label
+
+    tolerate_underscores = get_plugin_config(
+        "netbox_dns", "tolerate_underscores_in_labels"
+    ) or get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames")
+
+    if tolerate_leading_underscores:
+        if tolerate_underscores:
+            label = r"[a-z0-9_][a-z0-9_-]*(?<![-_])"
+            zone_label = rf"[{label_characters}_][{label_characters}_-]*(?<![-_])"
+        else:
+            label = rf"[a-z0-9_][a-z0-9-]*(?<!-)"
+            zone_label = rf"[{label_characters}_][{label_characters}-]*(?<!-)"
+    elif tolerate_underscores:
+        label = rf"[a-z0-9][a-z0-9_-]*(?<![-_])"
+        zone_label = rf"[{label_characters}][{label_characters}_-]*(?<![-_])"
+    else:
+        label = rf"[a-z0-9][a-z0-9-]*(?<!-)"
+        zone_label = rf"[{label_characters}][{label_characters}-]*(?<!-)"
+
+    return label, zone_label
+
+
+def has_invalid_double_dash(name):
+    return bool(re.findall(r"\b(?!xn)..--", name, re.IGNORECASE))
+
+
+def validate_fqdn(name, always_tolerant=False):
+    label, zone_label = _get_label(always_tolerant=always_tolerant)
+    regex = rf"^(\*|{label})(\.{zone_label})+\.?$"
+
+    if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
+        raise ValidationError(f"{name} is not a valid fully qualified DNS host name")
+
+
+def validate_generic_name(
+    name, tolerate_leading_underscores=False, always_tolerant=False
+):
+    label, zone_label = _get_label(
+        tolerate_leading_underscores=tolerate_leading_underscores,
+        always_tolerant=always_tolerant,
+    )
+    regex = rf"^([*@]|(\*\.)?{label}(\.{zone_label})*\.?)$"
+
+    if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
+        raise ValidationError(f"{name} is not a valid DNS host name")
+
+
+def validate_domain_name(
+    name, always_tolerant=False, allow_empty_label=False, zone_name=False
+):
+    if name == "@" and allow_empty_label:
+        return
+
+    if name == "." and (
+        always_tolerant or get_plugin_config("netbox_dns", "enable_root_zones")
+    ):
+        return
+
+    label, zone_label = _get_label(always_tolerant=always_tolerant)
+    if zone_name:
+        regex = rf"^{zone_label}(\.{zone_label})*\.?$"
+    else:
+        regex = rf"^{label}(\.{zone_label})*\.?$"
+
+    if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
+        raise ValidationError(f"{name} is not a valid DNS domain name")

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/netbox_dns/views/zone.py

@@ -40,6 +40,7 @@ class ZoneView(generic.ObjectView):
         context = {
             "nameserver_warnings": ns_warnings,
             "nameserver_errors": ns_errors,
+            "parent_zone": instance.parent_zone,
         }
 
         name = dns_name.from_text(instance.name)
@@ -165,3 +166,22 @@ class ZoneRFC2317ChildZoneListView(generic.ObjectChildrenView):
 
     def get_children(self, request, parent):
         return parent.rfc2317_child_zones.all()
+
+
+@register_model_view(Zone, "child_zones")
+class ZoneChildZoneListView(generic.ObjectChildrenView):
+    queryset = Zone.objects.all()
+    child_model = Zone
+    table = ZoneTable
+    filterset = ZoneFilterSet
+    template_name = "netbox_dns/zone/child_zone.html"
+
+    tab = ViewTab(
+        label="Child Zones",
+        permission="netbox_dns.view_zone",
+        badge=lambda obj: obj.child_zones.count(),
+        hide_if_empty=True,
+    )
+
+    def get_children(self, request, parent):
+        return parent.child_zones

{netbox_plugin_dns-1.0.2 → netbox_plugin_dns-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "1.0.2"
+version = "1.0.4"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = ["Peter Eckel <pete@netbox-dns.org>"]
 homepage = "https://github.com/peteeckel/netbox-plugin-dns"

netbox_plugin_dns-1.0.2/netbox_dns/validators/dns_name.py

@@ -1,65 +0,0 @@
-import re
-
-from django.core.exceptions import ValidationError
-
-from netbox.plugins.utils import get_plugin_config
-
-LABEL = r"[a-z0-9][a-z0-9-]*(?<!-)"
-TOLERANT_LABEL = r"[a-z0-9][a-z0-9-_]*(?<![-_])"
-LEADING_UNDERSCORE_LABEL = r"[a-z0-9_][a-z0-9-]*(?<!-)"
-TOLERANT_LEADING_UNDERSCORE_LABEL = r"[a-z0-9_][a-z0-9-_]*(?<![-_])"
-
-
-def has_invalid_double_dash(name):
-    return bool(re.findall(r"\b(?!xn)..--", name, re.IGNORECASE))
-
-
-def validate_fqdn(name, always_tolerant=False):
-    if always_tolerant or get_plugin_config(
-        "netbox_dns", "tolerate_underscores_in_hostnames"
-    ):
-        regex = rf"^(\*|{TOLERANT_LABEL})(\.{TOLERANT_LABEL})+\.?$"
-    else:
-        regex = rf"^(\*|{LABEL})(\.{LABEL})+\.?$"
-
-    if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid fully qualified DNS host name")
-
-
-def validate_extended_hostname(
-    name, tolerate_leading_underscores=False, always_tolerant=False
-):
-    if always_tolerant or tolerate_leading_underscores:
-        if always_tolerant or get_plugin_config(
-            "netbox_dns", "tolerate_underscores_in_hostnames"
-        ):
-            regex = rf"^([*@]|(\*\.)?{TOLERANT_LEADING_UNDERSCORE_LABEL}(\.{TOLERANT_LEADING_UNDERSCORE_LABEL})*\.?)$"
-        else:
-            regex = rf"^([*@]|(\*\.)?{LEADING_UNDERSCORE_LABEL}(\.{LEADING_UNDERSCORE_LABEL})*\.?)$"
-    elif get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
-        regex = rf"^([*@]|(\*\.)?{TOLERANT_LABEL}(\.{TOLERANT_LABEL})*\.?)$"
-    else:
-        regex = rf"^([*@]|(\*\.)?{LABEL}(\.{LABEL})*\.?)$"
-
-    if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid DNS host name")
-
-
-def validate_domain_name(name, always_tolerant=False, allow_empty_label=False):
-    if name == "@" and allow_empty_label:
-        return
-
-    if name == "." and (
-        always_tolerant or get_plugin_config("netbox_dns", "enable_root_zones")
-    ):
-        return
-
-    if always_tolerant:
-        regex = rf"^{TOLERANT_LEADING_UNDERSCORE_LABEL}(\.{TOLERANT_LEADING_UNDERSCORE_LABEL})*\.?$"
-    elif get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
-        regex = rf"^{TOLERANT_LABEL}(\.{TOLERANT_LABEL})*\.?$"
-    else:
-        regex = rf"^{LABEL}(\.{LABEL})*\.?$"
-
-    if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid DNS domain name")