netbox-plugin-dns 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

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_dns/mixins/__init__.py

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

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_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_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_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_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_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_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.dist-info → netbox_plugin_dns-1.0.2.dist-info}/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.dist-info → netbox_plugin_dns-1.0.2.dist-info}/METADATA

@@ -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.dist-info → netbox_plugin_dns-1.0.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=zdgTkVLTJz0gaJh2i7N7iKc8fLnfdL3jrCkCSk4Njeg,1038
+netbox_dns/__init__.py,sha256=-p2PZ7vCqtkAgdnSagyqpcfTghoVPFbsph9FYddm-jg,1038
 netbox_dns/api/nested_serializers.py,sha256=kkTU4Hylkbam9-lIniv8E0nTQwE1bz8D_GzIEOUy0Mw,2145
 netbox_dns/api/serializers.py,sha256=C4-TP1luq9QjEHjPS5cW7u2flAEdIFjghpVd_sa5S_Y,249
 netbox_dns/api/serializers_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -54,13 +54,15 @@ netbox_dns/migrations/0027_alter_registrar_iana_id.py,sha256=QUtRIrqqfkraFmzzeJF
 netbox_dns/migrations/0028_rfc2317_fields.py,sha256=D8r43xxBjYXiL6ycmX8RY5_WG7tRYEDjutOeYM1H56I,1364
 netbox_dns/migrations/0029_record_fqdn.py,sha256=UAAU38ekKQyiYDOJlcrz6Qbk4bqZfSHZyAHUZFFQrOw,808
 netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+netbox_dns/mixins/__init__.py,sha256=LxTEfpod_RHCyMtnzDljv0_dwqp2z3Q6tqbXW8LTGD8,35
+netbox_dns/mixins/object_modification.py,sha256=wq01fyCAai2staM2g5wV9BbW1hDUeRdXfJrSSkc2YK8,726
 netbox_dns/models/__init__.py,sha256=Q7UIEe2vGh18AZN4er6CykciwXPQGgUq0L-9718wZqU,182
 netbox_dns/models/contact.py,sha256=xXmNGuM6k1U98jO3mMmp93PXamh1YZQ270JOcy0FFnE,2958
-netbox_dns/models/nameserver.py,sha256=DD1cp7uxSQFOS6gzMl65XCbNhcX3iDlVapeEYqI-1lo,3078
-netbox_dns/models/record.py,sha256=Hn6ag9imobkLKRkxuSqcQfk32l6JKRiZJp326w9lT0M,26016
+netbox_dns/models/nameserver.py,sha256=5Z0sFTqpxksCFCOExxXZEY_mpEVTKLMtFv5urD9yvdg,3121
+netbox_dns/models/record.py,sha256=foj8PrFwilyXCU-H69vJanq5CkiD2N_oUC86_aA8WmE,26299
 netbox_dns/models/registrar.py,sha256=yidjVCq7WPECsHLKQRRCSzGbvG2jIXu8lqAKox0SU5Q,1502
-netbox_dns/models/view.py,sha256=PykIODa9lc5duYoXF2ZM7mRnvk5aOh-2LZy7XbJdo0g,2633
-netbox_dns/models/zone.py,sha256=mU1aUwj2C0BddlV6fREuNbYvXleO95VxteGswGiH2To,28442
+netbox_dns/models/view.py,sha256=HgQSpD8zQCxDpNel0b1_m4GlMYoRBpxiu6-Dtb1YnxI,2712
+netbox_dns/models/zone.py,sha256=ZBCMw2mUWaxsu-ULNI9MDVBy5XbuJlqOtQVEHoMmj24,28160
 netbox_dns/navigation.py,sha256=ykZJE5X-sqlnaTIU_pRzsio8Ux8zZVLH-iNsC2QqIxs,4062
 netbox_dns/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/signals/ipam_coupling.py,sha256=kJUKHUgq5XgWMhxB-312SPaZAYTLIYGgKO0lz2-z_rg,5594
@@ -69,7 +71,7 @@ netbox_dns/tables/contact.py,sha256=guT_wC3NJMYbVbXeMOg6nqmmmDcnjfbRI-SkjFDEYdU,
 netbox_dns/tables/nameserver.py,sha256=8BfXzDXNuhZHEyHjGlL4EA1LYx7XU3EPGHlby0k33II,767
 netbox_dns/tables/record.py,sha256=VwBWMiZN_Lkl9SXfJLzd8-7TM1CKetwE7azhScF4r7I,3162
 netbox_dns/tables/registrar.py,sha256=6C8XpxvR9O7IoVK0RD5RoZgXjkm-ORSBeKP6KbwcjHA,648
-netbox_dns/tables/view.py,sha256=90nc1_gLxOdKNYsV6_fYbAglTmyQklxMzLjCEC5HmCU,692
+netbox_dns/tables/view.py,sha256=NaZmDVefmrRWF711_zOJqOmguU66LtI6bOZQ9ZdxniA,699
 netbox_dns/tables/zone.py,sha256=4TlTB7lVsztZJ41aetkqr6PWosjZP-xc2sB9gDnw0z8,1886
 netbox_dns/template_content.py,sha256=NmtfseYrYcU3RxzCI5okwCpMTfTEs4d8aJnDYwo4MO8,3801
 netbox_dns/templates/netbox_dns/contact.html,sha256=fMHAQyLXIxohKoCTxFEnKetl9UVXeQgjasfpv_JONaw,2855
@@ -97,7 +99,7 @@ netbox_dns/urls/zone.py,sha256=wYRAhtq695K0QSrvNj6gdFaf1gExEN5vwmYXLAA9FrU,1849
 netbox_dns/utilities/__init__.py,sha256=dVPi1gAGaRum-aQYi0oLgagRYrTVQNY5bmi2Ig02cOo,1835
 netbox_dns/utilities/ipam_coupling.py,sha256=6z1Fx8fhesf15gLTHYc0KVqE3_YhJbNPAjqFOvWlqK8,3441
 netbox_dns/validators/__init__.py,sha256=5W8s31R1aT5B_mKJjTRwogEKj-Xun05iCyvRuYVGkdM,47
-netbox_dns/validators/dns_name.py,sha256=sxa0tyJw4Ep1uYw3nVsLZNqnykRbmn9pd7oAFDTKFp4,2449
+netbox_dns/validators/dns_name.py,sha256=Q_Xf4YpztLWHlg5OLGaalfh5W5GakDpRiZ38KXqcuaU,2543
 netbox_dns/validators/rfc2317.py,sha256=L2Z-z5ghktFyWMLVZPeK8OEVGnQzbXD11fha2xGHM5E,501
 netbox_dns/views/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/views/contact.py,sha256=mBWM92UVjoz90JCUGO7kaFUI0_yA7tH4lSHxOZQB3MQ,2253
@@ -106,7 +108,7 @@ netbox_dns/views/record.py,sha256=DDHbxQ33P_mduoPquvyXrdrqNT6r79qShLg1uJzU4Ic,43
 netbox_dns/views/registrar.py,sha256=NK6jTYRwRjaVjYmI7T4Phh_gjXg9yPrxl-7vciZ9doc,2090
 netbox_dns/views/view.py,sha256=a3l6pybhqGb_RMxrRgFT1Gia9tRq8EmXFxPv9WUId0U,1913
 netbox_dns/views/zone.py,sha256=EqkjXuX1xhkjDgaSNgFBvnA74IhuK_zDWlHPb3_4YKQ,4591
-netbox_plugin_dns-1.0.1.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
-netbox_plugin_dns-1.0.1.dist-info/METADATA,sha256=v3F-UQK6_k3KOOE8lQZgls9hfvL2hxwje1Bm7aCBZQ0,6048
-netbox_plugin_dns-1.0.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-netbox_plugin_dns-1.0.1.dist-info/RECORD,,
+netbox_plugin_dns-1.0.2.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
+netbox_plugin_dns-1.0.2.dist-info/METADATA,sha256=g50relhX2IGxacZ1-5DMEyzS5CxjjoLwnCQHipiNCko,6146
+netbox_plugin_dns-1.0.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+netbox_plugin_dns-1.0.2.dist-info/RECORD,,