netbox-plugin-dns 1.3.2__tar.gz → 1.3.4__tar.gz

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.3.2
+Version: 1.3.4
 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

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/__init__.py

@@ -4,7 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
 from netbox.plugins import PluginConfig
 from netbox.plugins.utils import get_plugin_config
 
-__version__ = "1.3.2"
+__version__ = "1.3.4"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/forms/zone.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.db import transaction
+from django.db import models, transaction
 from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.exceptions import ValidationError
@@ -101,7 +101,14 @@ class ZoneTemplateUpdateMixin:
                     custom_fields = {}
                     for key, value in zone_data.copy().items():
                         if key.startswith("cf_"):
-                            custom_fields[key[3:]] = value
+                            if isinstance(value, models.Model):
+                                custom_fields[key[3:]] = value.pk
+                            elif isinstance(value, models.QuerySet):
+                                custom_fields[key[3:]] = list(
+                                    value.values_list("pk", flat=True)
+                                )
+                            else:
+                                custom_fields[key[3:]] = value
                             zone_data.pop(key)
                     if custom_fields:
                         zone_data["custom_field_data"] = custom_fields

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/models/zone.py

@@ -585,6 +585,30 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 managed=True,
             )
 
+    def _check_nameserver_address_records(self, nameserver):
+        name = dns_name.from_text(nameserver.name, origin=None)
+        parent = name.parent()
+
+        if len(parent) < 2:
+            return None
+
+        try:
+            ns_zone = Zone.objects.get(view_id=self.view.pk, name=parent.to_text())
+        except ObjectDoesNotExist:
+            return None
+
+        relative_name = name.relativize(parent).to_text()
+        address_records = ns_zone.records.filter(
+            Q(status__in=RECORD_ACTIVE_STATUS_LIST),
+            Q(Q(name=f"{nameserver.name}.") | Q(name=relative_name)),
+            Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
+        )
+
+        if not address_records.exists():
+            return _(
+                "Nameserver {ns} does not have an active address record in zone {zone}"
+            ).format(ns=nameserver.name, zone=ns_zone)
+
     def check_nameservers(self):
         nameservers = self.nameservers.all()
 
@@ -597,33 +621,15 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             )
 
         for _nameserver in nameservers:
-            name = dns_name.from_text(_nameserver.name, origin=None)
-            parent = name.parent()
-
-            if len(parent) < 2:
-                continue
-
-            try:
-                ns_zone = Zone.objects.get(view_id=self.view.pk, name=parent.to_text())
-            except ObjectDoesNotExist:
-                continue
-
-            relative_name = name.relativize(parent).to_text()
-            address_records = ns_zone.records.filter(
-                Q(status__in=RECORD_ACTIVE_STATUS_LIST),
-                Q(Q(name=f"{_nameserver.name}.") | Q(name=relative_name)),
-                Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
-            )
-
-            if not address_records:
-                ns_warnings.append(
-                    _(
-                        "Nameserver {nameserver} does not have an active address record in zone {zone}"
-                    ).format(nameserver=_nameserver.name, zone=ns_zone)
-                )
+            warning = self._check_nameserver_address_records(_nameserver)
+            if warning is not None:
+                ns_warnings.append(warning)
 
         return ns_warnings, ns_errors
 
+    def check_soa_mname(self):
+        return self._check_nameserver_address_records(self.soa_mname)
+
     def check_expiration(self):
         if self.expiration_date is None:
             return None, None

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/models/zone_template.py

@@ -28,6 +28,8 @@ class ZoneTemplate(NetBoxModel):
         "description",
         "nameservers",
         "record_templates",
+        "soa_mname",
+        "soa_rname",
         "dnssec_policy",
         "registrar",
         "registrant",

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/templates/netbox_dns/zone/base.html

@@ -7,7 +7,7 @@
 
 {% block extra_controls %}
 {% if perms.netbox_dns.add_record %}
-<a href="{% url 'plugins:netbox_dns:record_add' %}?zone={{ object.pk }}&return_url={{ object.get_absolute_url }}">
+<a href="{% url 'plugins:netbox_dns:record_add' %}?zone={{ object.pk }}&return_url={% url 'plugins:netbox_dns:zone_records' pk=object.pk %}">
     <button type="submit" class="btn btn-primary" name="add-record">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>{% trans "Add Record" %}
     </button>

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/templates/netbox_dns/zone.html

@@ -137,6 +137,13 @@
                     <th scope="row">{% trans "MName" %}</th>
                     <td>{{ object.soa_mname|linkify }}</td>
                 </tr>
+                {% if mname_warning %}
+                <tr>
+                    <th class="text-warning" scope="row">{% trans "Warning" %}</th>
+                    <td class="text-warning">{{ mname_warning }}</td>
+                </tr>
+                {% endif %}
+
                 <tr>
                     <th scope="row">{% trans "RName" %}</th>
                     <td>{{ object.soa_rname }}</td>

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/utilities/ipam_dnssync.py

@@ -227,10 +227,15 @@ def delete_dns_records(ip_address, view=None):
         # TODO: Find something better. This is really awful.
         # -
         address_records = Record.objects.filter(
-            type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
-            managed=True,
-            ip_address=ip_address.address.ip,
-            ipam_ip_address__isnull=True,
+            Q(
+                Q(ipam_ip_address=ip_address)
+                | Q(
+                    type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
+                    managed=True,
+                    ip_address=ip_address.address,
+                    ipam_ip_address__isnull=True,
+                )
+            ),
         )
 
     if view is not None:

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_dns/views/zone.py

@@ -52,10 +52,12 @@ class ZoneView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         ns_warnings, ns_errors = instance.check_nameservers()
+        mname_warning = instance.check_soa_mname()
 
         context = {
             "nameserver_warnings": ns_warnings,
             "nameserver_errors": ns_errors,
+            "mname_warning": mname_warning,
             "parent_zone": instance.parent_zone,
         }
 

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.3.2
+Version: 1.3.4
 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

{netbox_plugin_dns-1.3.2 → netbox_plugin_dns-1.3.4}/pyproject.toml

@@ -1,11 +1,13 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.3.2"
+version = "1.3.4"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},
 ]
-license = {file="LICENCE"}
+license-files = [
+    "LICENSE"
+]
 readme = "README.md"
 keywords = ["netbox", "netbox-plugin", "dns"]
 classifiers = [