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

netbox_dns/templates/netbox_dns/zone/child.html

@@ -2,6 +2,7 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 {% load perms %}
+{% load i18n %}
 
 {% block content %}
     {% include 'inc/table_controls_htmx.html' with table_modal="ZoneTable_config" %}
@@ -23,12 +24,12 @@
                          {% block bulk_buttons %}{% endblock %}
                          {% if bulk_edit_url and perms.netbox_dns.change_zone %}
                              <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning">
-                                 <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
+                                 <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
                              </button>
                          {% endif %}
                          {% if bulk_delete_url and perms.netbox_dns.delete_zone %}
                              <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger">
-                                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
+                                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
                              </button>
                          {% endif %}
                      </div>

netbox_dns/templates/netbox_dns/zone/record.html

@@ -2,6 +2,7 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 {% load perms %}
+{% load i18n %}
 
 {% block content %}
     {% include 'inc/table_controls_htmx.html' with table_modal="RecordTable_config" %}
@@ -23,12 +24,12 @@
                            {% block bulk_buttons %}{% endblock %}
                            {% if bulk_edit_url and perms.netbox_dns.change_record %}
                                <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning">
-                                   <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
+                                   <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
                                </button>
                            {% endif %}
                            {% if bulk_delete_url and perms.netbox_dns.delete_record %}
                                <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger">
-                                   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
+                                   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
                                </button>
                            {% endif %}
                        </div>

netbox_dns/templates/netbox_dns/zone/registration.html

@@ -1,32 +1,33 @@
 {% extends 'netbox_dns/zone/base.html' %}
 {% load helpers %}
+{% load i18n %}
 
 {% block content %}
 <div class="card">
-    <h5 class="card-header">Domain Registration</h5>
+    <h5 class="card-header">{% trans "Domain Registration" %}</h5>
     <table class="table table-hover attr-table">
         <tr>
-            <th scope="row">Registrar</th>
+            <th scope="row">{% trans "Registrar" %}</th>
             <td>{{ object.registrar|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Registry Domain ID</th>
+            <th scope="row">{% trans "Registry Domain ID" %}</th>
             <td>{{ object.registry_domain_id|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Registrant</th>
+            <th scope="row">{% trans "Registrant" %}</th>
             <td>{{ object.registrant|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Administrative Contact</th>
+            <th scope="row">{% trans "Administrative Contact" %}</th>
             <td>{{ object.admin_c|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Technical Contact</th>
+            <th scope="row">{% trans "Technical Contact" %}</th>
             <td>{{ object.tech_c|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Billing Contact</th>
+            <th scope="row">{% trans "Billing Contact" %}</th>
             <td>{{ object.billing_c|linkify|placeholder }}</td>
         </tr>
     </table>

netbox_dns/templates/netbox_dns/zone.html

@@ -1,43 +1,41 @@
 {% extends 'netbox_dns/zone/base.html' %}
 {% load helpers %}
-{% 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">
-                Zone
-            </h5>
+            <h5 class="card-header">{% trans "Zone" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Name</th>
+                    <th scope="row">{% trans "Name" %}</th>
                     <td>{{ object.name }}</td>
                 </tr>
                 {% if unicode_name %}
                     <tr>
-                        <th scope="row">IDN</th>
+                        <th scope="row">{% trans "IDN" %}</th>
                         <td>{{ unicode_name }}</td>
                     </tr>
                 {% endif %}
                 {% if parent_zone %}
                     <tr>
-                        <th scope="row">Parent Zone</th>
+                        <th scope="row">{% trans "Parent Zone" %}</th>
                         <td>{{ parent_zone|linkify }}</td>
                     </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">View</th>
+                    <th scope="row">{% trans "View" context "DNS" %}</th>
                     <td>{{ object.view|linkify }}</td>
                 </tr>
                 {% if object.description %}
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td style="word-break:break-all;">{{ object.description }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">Tenant</th>
+                    <th scope="row">{% trans "Tenant" %}</th>
                     <td>
                         {% if object.tenant.group %}
                             {{ object.tenant.group|linkify }} /
@@ -46,11 +44,11 @@
                     </td>
                 </tr>
                 <tr>
-                    <th scope="row">Status</th>
+                    <th scope="row">{% trans "Status" %}</th>
                     <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Nameservers</th>
+                    <th scope="row">{% trans "Nameservers" %}</th>
                     <td>
                         <table>
                             {% for nameserver in object.nameservers.all %}
@@ -60,7 +58,7 @@
                     </td>
                 {% if nameserver_warnings %}
                 <tr>
-                    <th class="text-warning" scope="row">Warnings</th>
+                    <th class="text-warning" scope="row">{% trans "Warnings" %}</th>
                     <td>
                         <table>
                             {% for warning in nameserver_warnings %}
@@ -74,7 +72,7 @@
                 {% endif %}
                 {% if nameserver_errors %}
                 <tr>
-                    <th class="text-danger" scope="row">Errors</th>
+                    <th class="text-danger" scope="row">{% trans "Errors" %}</th>
                     <td>
                         <table>
                             {% for error in nameserver_errors %}
@@ -88,11 +86,11 @@
                 {% endif %}
                 </tr>
                 <tr>
-                    <th scope="row">Default TTL</th>
+                    <th scope="row">{% trans "Default TTL" %}</th>
                     <td>{{ object.default_ttl }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td>{{ object.description }}</td>
                 </tr>
             </table>
@@ -103,64 +101,64 @@
     </div>
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">Zone SOA</h5>
+            <h5 class="card-header">{% trans "Zone SOA" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">TTL</th>
+                    <th scope="row">{% trans "TTL" %}</th>
                     <td>{{ object.soa_ttl }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">MName</th>
+                    <th scope="row">{% trans "MName" %}</th>
                     <td>{{ object.soa_mname|linkify }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">RName</th>
+                    <th scope="row">{% trans "RName" %}</th>
                     <td>{{ object.soa_rname }}</td>
                 </tr>
                 {% if object.soa_serial_auto %}
                 <tr>
-                    <th scope="row">Serial (auto-generated)</th>
+                    <th scope="row">{% trans "Serial (auto-generated)" %}</th>
                     <td>{{ object.soa_serial }}</td>
                 </tr>
                 {% else %}
                 <tr>
-                    <th scope="row">Serial</th>
+                    <th scope="row">{% trans "Serial" context "SOA" %}</th>
                     <td>{{ object.soa_serial }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">Refresh</th>
+                    <th scope="row">{% trans "Refresh" %}</th>
                     <td>{{ object.soa_refresh }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Retry</th>
+                    <th scope="row">{% trans "Retry" %}</th>
                     <td>{{ object.soa_retry }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Expire</th>
+                    <th scope="row">{% trans "Expire" %}</th>
                     <td>{{ object.soa_expire }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Minimum TTL</th>
+                    <th scope="row">{% trans "Minimum TTL" %}</th>
                     <td>{{ object.soa_minimum }}</td>
                 </tr>
             </table>
         </div>
         {% if object.rfc2317_prefix %}
         <div class="card">
-            <h5 class="card-header">RFC2317</h5>
+            <h5 class="card-header">{% trans "RFC2317" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Prefix</th>
+                    <th scope="row">{% trans "Prefix" %}</th>
                     <td>{{ object.rfc2317_prefix }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Parent Managed</th>
+                    <th scope="row">{% trans "Parent Managed" %}</th>
                     <td>{% checkmark object.rfc2317_parent_managed %}</td>
                 </tr>
                 {% if object.rfc2317_parent_managed %}
                 <tr>
-                    <th scope="row">Parent Zone</th>
+                    <th scope="row">{% trans "Parent Zone" %}</th>
                     <td>{{ object.rfc2317_parent_zone|linkify }}</td>
                 </tr>
                 {% endif %}

netbox_dns/templates/netbox_dns/zonetemplate.html

@@ -3,27 +3,26 @@
 {% load plugins %}
 {% load render_table from django_tables2 %}
 {% load perms %}
+{% load i18n %}
 
 {% block content %}
 <div class="row">
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">
-                Zone Template
-            </h5>
+            <h5 class="card-header">{% trans "Zone Template" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Name</th>
+                    <th scope="row">{% trans "Name" %}</th>
                     <td>{{ object.name }}</td>
                 </tr>
                 {% if object.description %}
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td style="word-break:break-all;">{{ object.description }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">Tenant</th>
+                    <th scope="row">{% trans "Tenant" %}</th>
                     <td>
                         {% if object.tenant.group %}
                             {{ object.tenant.group|linkify }} /
@@ -32,7 +31,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <th scope="row">Nameservers</th>
+                    <th scope="row">{% trans "Nameservers" %}</th>
                     <td>
                         <table>
                             {% for nameserver in object.nameservers.all %}
@@ -42,7 +41,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td>{{ object.description }}</td>
                 </tr>
             </table>
@@ -53,34 +52,45 @@
     </div>
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">Domain Registration</h5>
+            <h5 class="card-header">{% trans "Domain Registration" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Registrar</th>
+                    <th scope="row">{% trans "Registrar" %}</th>
                     <td>{{ object.registrar|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Registrant</th>
+                    <th scope="row">{% trans "Registrant" %}</th>
                     <td>{{ object.registrant|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Administrative Contact</th>
+                    <th scope="row">{% trans "Administrative Contact" %}</th>
                     <td>{{ object.admin_c|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Technical Contact</th>
+                    <th scope="row">{% trans "Technical Contact" %}</th>
                     <td>{{ object.tech_c|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Billing Contact</th>
+                    <th scope="row">{% trans "Billing Contact" %}</th>
                     <td>{{ object.billing_c|linkify|placeholder }}</td>
                 </tr>
             </table>
             </div>
         </div>
     </div>
-    <div class="col col-md-12">
-      {% include 'inc/panel_table.html' with table=record_template_table heading="Record Templates" %}
-    </div>
+    {% if record_template_table %}
+        <div class="col col-md-12">
+            <div class="card">
+                {% if record_template_table.rows|length == 1 %}
+                    <h2 class="card-header">{% trans "Record Template" %}</h2>
+                {% else %}
+                    <h2 class="card-header">{% trans "Record Templates" %}</h2>
+                {% endif %}
+                <div class="table-responsive">
+                    {% render_table record_template_table 'inc/table.html' %}
+                </div>
+            </div>
+        </div>
+    {% endif %}
 </div>
 {% endblock %}

netbox_dns/utilities/ipam_dnssync.py

@@ -158,12 +158,13 @@ def check_dns_records(ip_address, zone=None, view=None):
             record.clean(new_zone=new_zone)
 
 
-def update_dns_records(ip_address, view=None):
+def update_dns_records(ip_address, view=None, force=False):
     from netbox_dns.models import Zone, Record
 
+    updated = False
+
     if ip_address.dns_name == "":
-        delete_dns_records(ip_address)
-        return
+        return delete_dns_records(ip_address)
 
     zones = get_zones(ip_address, view=view)
 
@@ -178,16 +179,19 @@ def update_dns_records(ip_address, view=None):
                 "ipaddress_dns_disabled"
             ):
                 record.delete()
+                updated = True
                 continue
 
             record.update_fqdn()
-            if not _match_data(ip_address, record):
+            if not _match_data(ip_address, record) or force:
                 updated, deleted = record.update_from_ip_address(ip_address)
 
                 if deleted:
                     record.delete()
+                    updated = True
                 elif updated:
                     record.save()
+                    updated = True
 
         zones = Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
             pk__in=set(
@@ -203,9 +207,13 @@ def update_dns_records(ip_address, view=None):
 
         if record is not None:
             record.save()
+            updated = True
+
+    return updated
 
 
 def delete_dns_records(ip_address, view=None):
+    deleted = False
 
     if view is None:
         address_records = ip_address.netbox_dns_records.all()
@@ -214,6 +222,9 @@ def delete_dns_records(ip_address, view=None):
 
     for record in address_records:
         record.delete()
+        deleted = True
+
+    return deleted
 
 
 def get_views_by_prefix(prefix):

netbox_dns/validators/dns_name.py

@@ -1,6 +1,7 @@
 import re
 
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext as _
 
 from netbox.plugins.utils import get_plugin_config
 
@@ -55,7 +56,9 @@ def validate_fqdn(name, always_tolerant=False):
     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")
+        raise ValidationError(
+            _("{name} is not a valid fully qualified DNS host name").format(name=name)
+        )
 
 
 def validate_rname(name, always_tolerant=False):
@@ -63,7 +66,7 @@ def validate_rname(name, always_tolerant=False):
     regex = rf"^(\*|{label})(\\\.{label})*(\.{zone_label}){{2,}}\.?$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid RNAME")
+        raise ValidationError(_("{name} is not a valid RName").format(name=name))
 
 
 def validate_generic_name(
@@ -76,7 +79,9 @@ def validate_generic_name(
     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")
+        raise ValidationError(
+            _("{name} is not a valid DNS host name").format(name=name)
+        )
 
 
 def validate_domain_name(
@@ -97,4 +102,6 @@ def validate_domain_name(
         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")
+        raise ValidationError(
+            _("{name} is not a valid DNS domain name").format(name=name)
+        )

netbox_dns/validators/dns_value.py

@@ -1,7 +1,11 @@
-import dns
+import re
+import textwrap
+
 from dns import rdata, name as dns_name
+from dns.exception import SyntaxError
 
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext as _
 
 from netbox_dns.choices import RecordClassChoices, RecordTypeChoices
 from netbox_dns.validators import (
@@ -10,27 +14,69 @@ from netbox_dns.validators import (
     validate_generic_name,
 )
 
+MAX_TXT_LENGTH = 255
 
 __all__ = ("validate_record_value",)
 
 
-def validate_record_value(record_type, value):
+def validate_record_value(record):
     def _validate_idn(name):
         try:
             name.to_unicode()
         except dns_name.IDNAException as exc:
             raise ValidationError(
-                f"{name.to_text()} is not a valid IDN: {exc}."
-            ) from None
+                "{name} is not a valid IDN: {error}.".format(
+                    name=name.to_text(), error=exc
+                )
+            )
+
+    def _split_text_value(value):
+        # +
+        # Text values longer than 255 characters need to be broken up for TXT and
+        # SPF records.
+        # First, in case they had been split into separate strings, reassemble the
+        # original (long) value, then split it into chunks of a maximum length of
+        # 255 (preferably at word boundaries), and then build a sequence of partial
+        # strings enclosed in double quotes and separated by space.
+        #
+        # See https://datatracker.ietf.org/doc/html/rfc4408#section-3.1.3 for details.
+        # -
+        raw_value = "".join(re.findall(r'"([^"]+)"', value))
+        if not raw_value:
+            raw_value = value
+
+        return " ".join(
+            f'"{part}"'
+            for part in textwrap.wrap(raw_value, MAX_TXT_LENGTH, drop_whitespace=False)
+        )
+
+    if record.type in (RecordTypeChoices.TXT, RecordTypeChoices.SPF):
+        if not (record.value.isascii() and record.value.isprintable()):
+            raise ValidationError(
+                _(
+                    "Record value {value} for a type {type} record is not a printable ASCII string."
+                ).format(value=record.value, type=record.type)
+            )
+
+        if len(record.value) <= MAX_TXT_LENGTH:
+            return
+
+        try:
+            rr = rdata.from_text(RecordClassChoices.IN, record.type, record.value)
+        except SyntaxError as exc:
+            if str(exc) == "string too long":
+                record.value = _split_text_value(record.value)
 
     try:
-        rr = rdata.from_text(RecordClassChoices.IN, record_type, value)
-    except dns.exception.SyntaxError as exc:
+        rr = rdata.from_text(RecordClassChoices.IN, record.type, record.value)
+    except SyntaxError as exc:
         raise ValidationError(
-            f"Record value {value} is not a valid value for a {record_type} record: {exc}."
-        ) from None
+            _(
+                "Record value {value} is not a valid value for a {type} record: {error}."
+            ).format(value=record.value, type=record.type, error=exc)
+        )
 
-    match record_type:
+    match record.type:
         case RecordTypeChoices.CNAME:
             _validate_idn(rr.target)
             validate_domain_name(

netbox_dns/validators/rfc2317.py

@@ -1,4 +1,5 @@
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext as _
 
 
 __all__ = (
@@ -11,15 +12,17 @@ __all__ = (
 def validate_prefix(prefix):
     if prefix.ip != prefix.cidr.ip:
         raise ValidationError(
-            f"{prefix} is not a valid prefix. Did you mean {prefix.cidr}?"
+            _("{prefix} is not a valid prefix. Did you mean {cidr}?").format(
+                prefix=prefix, cidr=prefix.cidr
+            )
         )
 
 
 def validate_ipv4(prefix):
     if prefix.version != 4:
-        raise ValidationError("RFC2317 requires an IPv4 prefix.")
+        raise ValidationError(_("RFC2317 requires an IPv4 prefix."))
 
 
 def validate_rfc2317(prefix):
     if prefix.prefixlen <= 24:
-        raise ValidationError("RFC2317 requires at least 25 bit prefix length.")
+        raise ValidationError(_("RFC2317 requires at least 25 bit prefix length."))

netbox_dns/views/nameserver.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 ViewTab, register_model_view
 from tenancy.views import ObjectContactsView
@@ -91,7 +93,7 @@ class NameServerZoneListView(generic.ObjectChildrenView):
     hide_if_empty = True
 
     tab = ViewTab(
-        label="Zones",
+        label=_("Zones"),
         permission="netbox_dns.view_zone",
         badge=lambda obj: obj.zones.count(),
         hide_if_empty=True,
@@ -111,7 +113,7 @@ class NameServerSOAZoneListView(generic.ObjectChildrenView):
     hide_if_empty = True
 
     tab = ViewTab(
-        label="SOA Zones",
+        label=_("SOA Zones"),
         permission="netbox_dns.view_zone",
         badge=lambda obj: obj.zones_soa.count(),
         hide_if_empty=True,

netbox_dns/views/record_template.py

@@ -46,9 +46,10 @@ class RecordTemplateView(generic.ObjectView):
         if instance.value != unicode_value:
             context["unicode_value"] = unicode_value
 
-        context["zone_template_table"] = ZoneTemplateDisplayTable(
-            data=instance.zone_templates.all()
-        )
+        if instance.zone_templates.exists():
+            context["zone_template_table"] = ZoneTemplateDisplayTable(
+                data=instance.zone_templates.all()
+            )
 
         return context
 

netbox_dns/views/registrar.py

@@ -1,3 +1,5 @@
+from django.utils.translation import gettext as _
+
 from netbox.views import generic
 
 from utilities.views import ViewTab, register_model_view
@@ -75,7 +77,7 @@ class RegistrarZoneListView(generic.ObjectChildrenView):
     hide_if_empty = True
 
     tab = ViewTab(
-        label="Zones",
+        label=_("Zones"),
         permission="netbox_dns.view_zone",
         badge=lambda obj: obj.zone_set.count(),
         hide_if_empty=True,