netbox-plugin-dns 1.2.10__tar.gz → 1.2.12__tar.gz

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.2.10
+Version: 1.2.12
 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.2.10 → netbox_plugin_dns-1.2.12}/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.2.10"
+__version__ = "1.2.12"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_dns/api/serializers_/dnssec_key_template.py

@@ -25,7 +25,7 @@ class DNSSECKeyTemplateSerializer(NetBoxModelSerializer):
         default=None,
         help_text=_("Policies using this Key Template"),
     )
-    tenant = TenantSerializer(required=False, allow_null=True)
+    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
 
     class Meta:
         model = DNSSECKeyTemplate

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_dns/api/serializers_/dnssec_policy.py

@@ -52,7 +52,7 @@ class DNSSECPolicySerializer(NetBoxModelSerializer):
         default=None,
         help_text=_("Zone templates this policy is assigned to"),
     )
-    tenant = TenantSerializer(required=False, allow_null=True)
+    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
 
     class Meta:
         model = DNSSECPolicy

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_dns/api/serializers_/nameserver.py

@@ -23,7 +23,7 @@ class NameServerSerializer(NetBoxModelSerializer):
         default=None,
         help_text=_("Zones served by the authoritative nameserver"),
     )
-    tenant = TenantSerializer(required=False, allow_null=True)
+    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
 
     class Meta:
         model = NameServer

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_dns/models/record.py

@@ -353,6 +353,21 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def is_delegation_record(self):
         return self in self.zone.delegation_records
 
+    def get_ptr_name(self, ptr_zone=None):
+        if ptr_zone is None:
+            ptr_zone = self.ptr_zone
+
+        if ptr_zone.is_rfc2317_zone:
+            ptr_name = self.rfc2317_ptr_name
+        else:
+            ptr_name = (
+                dns_name.from_text(ipaddress.ip_address(self.value).reverse_pointer)
+                .relativize(dns_name.from_text(ptr_zone.name))
+                .to_text()
+            )
+
+        return ptr_name
+
     def update_ptr_record(self, update_rfc2317_cname=True, save_zone_serial=True):
         ptr_zone = self.ptr_zone
 
@@ -368,15 +383,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                     self.ptr_record = None
             return
 
-        if ptr_zone.is_rfc2317_zone:
-            ptr_name = self.rfc2317_ptr_name
-        else:
-            ptr_name = (
-                dns_name.from_text(ipaddress.ip_address(self.value).reverse_pointer)
-                .relativize(dns_name.from_text(ptr_zone.name))
-                .to_text()
-            )
-
+        ptr_name = self.get_ptr_name(ptr_zone)
         ptr_value = self.fqdn
         ptr_record = self.ptr_record
 
@@ -647,6 +654,36 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 }
             )
 
+    def check_unique_ptr_record(self):
+        if (
+            self.disable_ptr
+            or not self.is_active
+            or not self.is_address_record
+            or not (ptr_zone := self.ptr_zone)
+            or not get_plugin_config("netbox_dns", "enforce_unique_records", False)
+        ):
+            return
+
+        ptr_record = Record.objects.filter(
+            zone__view=self.zone.view,
+            zone=self.ptr_zone,
+            name=self.get_ptr_name(ptr_zone),
+            value=self.fqdn,
+            status__in=RECORD_ACTIVE_STATUS_LIST,
+        )
+
+        if not self._state.adding and self.ptr_record is not None:
+            ptr_record = ptr_record.exclude(pk=self.ptr_record.pk)
+
+        if ptr_record.exists():
+            raise ValidationError(
+                {
+                    "value": _(
+                        "There is already an active PTR record for {value} with value {fqdn}."
+                    ).format(fqdn=self.fqdn, value=self.value)
+                }
+            )
+
     @property
     def absolute_value(self):
         if self.type in RecordTypeChoices.CUSTOM_TYPES:
@@ -790,6 +827,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         self.validate_name(new_zone=new_zone)
         self.validate_value()
         self.check_unique_record(new_zone=new_zone)
+        self.check_unique_ptr_record()
         if self._state.adding:
             self.check_unique_rrset_ttl()
 

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_dns/models/zone.py

@@ -664,6 +664,27 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 }
             )
 
+    def check_ptr_records(self):
+        if self._state.adding:
+            return
+
+        validation_errors = []
+
+        address_records = self.records.filter(
+            type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
+            disable_ptr=False,
+            status__in=RECORD_ACTIVE_STATUS_LIST,
+        )
+
+        for record in address_records:
+            try:
+                record.check_unique_ptr_record()
+            except ValidationError as exc:
+                validation_errors.append(exc)
+
+        if validation_errors:
+            raise ValidationError(validation_errors)
+
     def get_auto_serial(self):
         records = Record.objects.filter(zone_id=self.pk).exclude(
             type=RecordTypeChoices.SOA
@@ -888,6 +909,8 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if self.is_reverse_zone:
             self.arpa_network = self.network_from_name
 
+        self.check_ptr_records()
+
         if self.is_rfc2317_zone:
             if self.arpa_network is not None:
                 raise ValidationError(

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_dns/views/record.py

@@ -156,6 +156,7 @@ class RecordView(generic.ObjectView):
 
                 if Zone.objects.filter(
                     active=True,
+                    view=instance.zone.view,
                     name__iregex=regex_from_list(
                         get_parent_zone_names(
                             instance.fqdn,

{netbox_plugin_dns-1.2.10 → netbox_plugin_dns-1.2.12}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.2.10
+Version: 1.2.12
 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.2.10 → netbox_plugin_dns-1.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.2.10"
+version = "1.2.12"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},