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

{netbox_plugin_dns-1.0.1 → netbox_plugin_dns-1.0.2}/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2021 Aurora Research Lab
+Copyright (c) 2021-2023 Aurora Research Lab
+Copyright (c) 2023 Peter Eckel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.0.1
+Version: 1.0.2
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -44,6 +44,7 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record names and values
 * Automatic maintenance of PTR records for IPv6 and IPv4 address records
 * Automatic generation of SOA records, optionally including the serial number of the zone data
+* Validation of changes to the SOA SERIAL number, whether they are done automatically or manually
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 

{netbox_plugin_dns-1.0.1 → netbox_plugin_dns-1.0.2}/README.md

@@ -24,6 +24,7 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record names and values
 * Automatic maintenance of PTR records for IPv6 and IPv4 address records
 * Automatic generation of SOA records, optionally including the serial number of the zone data
+* Validation of changes to the SOA SERIAL number, whether they are done automatically or manually
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 

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

@@ -1,6 +1,6 @@
 from netbox.plugins import PluginConfig
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 
 class DNSConfig(PluginConfig):

netbox_plugin_dns-1.0.2/netbox_dns/mixins/__init__.py

@@ -0,0 +1 @@
+from .object_modification import *

netbox_plugin_dns-1.0.2/netbox_dns/mixins/object_modification.py

@@ -0,0 +1,26 @@
+from netbox.models import NetBoxModel
+
+
+class ObjectModificationMixin:
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if not hasattr(self.__class__, "check_fields"):
+            self.__class__.check_fields = (
+                {field.name for field in self._meta.fields}
+                - {field.name for field in NetBoxModel._meta.fields}
+                - {"id"}
+            )
+
+    @property
+    def changed_fields(self):
+        if self.pk is None:
+            return None
+
+        saved = self.__class__.objects.get(pk=self.pk)
+
+        return {
+            field
+            for field in self.check_fields
+            if getattr(self, field) != getattr(saved, field)
+        }

{netbox_plugin_dns-1.0.1 → netbox_plugin_dns-1.0.2}/netbox_dns/models/nameserver.py

@@ -14,11 +14,12 @@ from netbox_dns.utilities import (
     NameFormatError,
 )
 from netbox_dns.validators import validate_fqdn
+from netbox_dns.mixins import ObjectModificationMixin
 
 from .record import Record, RecordTypeChoices
 
 
-class NameServer(NetBoxModel):
+class NameServer(ObjectModificationMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -79,14 +80,12 @@ class NameServer(NetBoxModel):
     def save(self, *args, **kwargs):
         self.full_clean()
 
-        name_changed = (
-            self.pk is not None and self.name != NameServer.objects.get(pk=self.pk).name
-        )
+        changed_fields = self.changed_fields
 
         with transaction.atomic():
             super().save(*args, **kwargs)
 
-            if name_changed:
+            if changed_fields is not None and "name" in changed_fields:
                 soa_zones = self.zones_soa.all()
                 for soa_zone in soa_zones:
                     soa_zone.update_soa_record()

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

@@ -25,6 +25,7 @@ from netbox_dns.validators import (
     validate_extended_hostname,
     validate_domain_name,
 )
+from netbox_dns.mixins import ObjectModificationMixin
 
 # +
 # This is a hack designed to break cyclic imports between Record and Zone
@@ -102,7 +103,7 @@ class RecordStatusChoices(ChoiceSet):
     ]
 
 
-class Record(NetBoxModel):
+class Record(ObjectModificationMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
 
     unique_ptr_qs = Q(
@@ -211,9 +212,12 @@ class Record(NetBoxModel):
 
     def __str__(self):
         try:
-            name = dns_name.from_text(self.fqdn).relativize(dns_name.root).to_unicode()
+            fqdn = dns_name.from_text(
+                self.name, origin=dns_name.from_text(self.zone.name)
+            ).relativize(dns_name.root)
+            name = fqdn.to_unicode()
         except dns_name.IDNAException:
-            name = self.name
+            name = fqdn.to_text()
         except dns_name.LabelTooLong:
             name = f"{self.name[:59]}..."
 
@@ -783,7 +787,9 @@ class Record(NetBoxModel):
             self.ptr_record.delete()
             self.ptr_record = None
 
-        super().save(*args, **kwargs)
+        changed_fields = self.changed_fields
+        if changed_fields is None or changed_fields:
+            super().save(*args, **kwargs)
 
         _zone = self.zone
         if self.type != RecordTypeChoices.SOA and _zone.soa_serial_auto:

{netbox_plugin_dns-1.0.1 → netbox_plugin_dns-1.0.2}/netbox_dns/models/view.py

@@ -7,8 +7,10 @@ from netbox.search import SearchIndex, register_search
 from netbox.context import current_request
 from utilities.exceptions import AbortRequest
 
+from netbox_dns.mixins import ObjectModificationMixin
 
-class View(NetBoxModel):
+
+class View(ObjectModificationMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -53,13 +55,11 @@ class View(NetBoxModel):
         super().delete(*args, **kwargs)
 
     def clean(self, *args, old_state=None, **kwargs):
-        if self.pk is None:
+        if (changed_fields := self.changed_fields) is None:
             return
 
-        old_state = View.objects.get(pk=self.pk)
-
         if (
-            old_state.default_view
+            "default_view" in changed_fields
             and not self.default_view
             and not View.objects.filter(default_view=True).exclude(pk=self.pk).exists()
         ):
@@ -74,12 +74,14 @@ class View(NetBoxModel):
     def save(self, *args, **kwargs):
         self.clean()
 
-        old_state = None if self.pk is None else View.objects.get(pk=self.pk)
+        changed_fields = self.changed_fields
 
         super().save(*args, **kwargs)
 
-        if (old_state is None and self.default_view) or (
-            old_state is not None and self.default_view and not old_state.default_view
+        if (changed_fields is None and self.default_view) or (
+            changed_fields is not None
+            and self.default_view
+            and "default_view" in changed_fields
         ):
             other_views = View.objects.filter(default_view=True).exclude(pk=self.pk)
             for view in other_views:

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

@@ -35,6 +35,7 @@ from netbox_dns.validators import (
     validate_fqdn,
     validate_domain_name,
 )
+from netbox_dns.mixins import ObjectModificationMixin
 
 # +
 # This is a hack designed to break cyclic imports between View, Record and Zone
@@ -77,7 +78,7 @@ class ZoneStatusChoices(ChoiceSet):
     ]
 
 
-class Zone(NetBoxModel):
+class Zone(ObjectModificationMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (ZoneStatusChoices.STATUS_ACTIVE,)
 
     view = models.ForeignKey(
@@ -683,17 +684,7 @@ class Zone(NetBoxModel):
     def save(self, *args, **kwargs):
         self.full_clean()
 
-        new_zone = self.pk is None
-        if not new_zone:
-            old_zone = Zone.objects.get(pk=self.pk)
-
-        name_changed = not new_zone and old_zone.name != self.name
-        view_changed = not new_zone and old_zone.view != self.view
-        status_changed = not new_zone and old_zone.status != self.status
-        rfc2317_changed = not new_zone and (
-            old_zone.rfc2317_prefix != self.rfc2317_prefix
-            or old_zone.rfc2317_parent_managed != self.rfc2317_parent_managed
-        )
+        changed_fields = self.changed_fields
 
         if self.soa_serial_auto:
             self.soa_serial = self.get_auto_serial()
@@ -701,7 +692,7 @@ class Zone(NetBoxModel):
         super().save(*args, **kwargs)
 
         if (
-            new_zone or name_changed or view_changed or status_changed
+            changed_fields is None or {"name", "view", "status"} & changed_fields
         ) and self.is_reverse_zone:
             zones = Zone.objects.filter(
                 view=self.view,
@@ -733,11 +724,9 @@ class Zone(NetBoxModel):
                     child_zone.update_rfc2317_parent_zone()
 
         if (
-            new_zone
-            or name_changed
-            or view_changed
-            or status_changed
-            or rfc2317_changed
+            changed_fields is None
+            or {"name", "view", "status", "rfc2317_prefix", "rfc2317_parent_managed"}
+            & changed_fields
         ) and self.is_rfc2317_zone:
             zones = Zone.objects.filter(
                 view=self.view,
@@ -763,7 +752,7 @@ class Zone(NetBoxModel):
 
             self.update_rfc2317_parent_zone()
 
-        elif name_changed or view_changed or status_changed:
+        elif changed_fields is not None and {"name", "view", "status"} & changed_fields:
             for address_record in self.record_set.filter(
                 type__in=(record.RecordTypeChoices.A, record.RecordTypeChoices.AAAA)
             ):
@@ -772,7 +761,7 @@ class Zone(NetBoxModel):
             # Fix name in IP Address when zone name is changed
             if (
                 get_plugin_config("netbox_dns", "feature_ipam_coupling")
-                and name_changed
+                and "name" in changed_fields
             ):
                 for ip in IPAddress.objects.filter(
                     custom_field_data__ipaddress_dns_zone_id=self.pk
@@ -780,7 +769,7 @@ class Zone(NetBoxModel):
                     ip.dns_name = f'{ip.custom_field_data["ipaddress_dns_record_name"]}.{self.name}'
                     ip.save(update_fields=["dns_name"])
 
-        if name_changed:
+        if changed_fields is not None and "name" in changed_fields:
             for _record in self.record_set.all():
                 _record.save(
                     update_fields=["fqdn"],

{netbox_plugin_dns-1.0.1 → netbox_plugin_dns-1.0.2}/netbox_dns/tables/view.py

@@ -10,7 +10,7 @@ class ViewTable(TenancyColumnsMixin, NetBoxTable):
     name = tables.Column(
         linkify=True,
     )
-    default_view = tables.Column(
+    default_view = tables.BooleanColumn(
         verbose_name="Default View",
     )
     tags = TagColumn(url_name="plugins:netbox_dns:view_list")

{netbox_plugin_dns-1.0.1 → netbox_plugin_dns-1.0.2}/netbox_dns/validators/dns_name.py

@@ -54,9 +54,9 @@ def validate_domain_name(name, always_tolerant=False, allow_empty_label=False):
     ):
         return
 
-    if always_tolerant or get_plugin_config(
-        "netbox_dns", "tolerate_underscores_in_hostnames"
-    ):
+    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})*\.?$"

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "1.0.1"
+version = "1.0.2"
 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"