netbox-plugin-dns 1.1.0b1__tar.gz → 1.1.0b2__tar.gz

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b1
+Version: 1.1.0b2
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -8,7 +8,7 @@ Keywords: netbox,netbox-plugin,dns
 Author: Peter Eckel
 Author-email: pete@netbox-dns.org
 Requires-Python: >=3.10,<4.0
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/__init__.py

@@ -5,14 +5,14 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1.0-beta1"
+__version__ = "1.1.0b2"
 
 
 class DNSConfig(PluginConfig):
     name = "netbox_dns"
     verbose_name = "NetBox DNS"
     description = "NetBox plugin for DNS data"
-    min_version = "4.1.0-beta1"
+    min_version = "4.0.0"
     version = __version__
     author = "Peter Eckel"
     author_email = "pete@netbox-dns.org"
@@ -31,6 +31,7 @@ class DNSConfig(PluginConfig):
             IPAddressStatusChoices.STATUS_DHCP,
             IPAddressStatusChoices.STATUS_SLAAC,
         ],
+        "autodns_conflict_deactivate": False,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
         "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/forms/view.py

@@ -25,8 +25,9 @@ from ipam.models import Prefix
 from netbox_dns.models import View
 from netbox_dns.fields import PrefixDynamicModelMultipleChoiceField
 from netbox_dns.utilities import (
-    get_ip_addresses_by_prefix,
+    check_dns_records,
     update_dns_records,
+    get_ip_addresses_by_prefix,
     get_views_by_prefix,
 )
 
@@ -52,7 +53,7 @@ class ViewPrefixUpdateMixin:
         for prefix in prefixes.difference(old_prefixes):
             for ip_address in get_ip_addresses_by_prefix(prefix, check_view=False):
                 try:
-                    update_dns_records(ip_address, commit=False, view=self.instance)
+                    check_dns_records(ip_address, view=self.instance)
                 except ValidationError as exc:
                     self.add_error("prefixes", exc.messages)
 
@@ -74,7 +75,7 @@ class ViewPrefixUpdateMixin:
             # parent. If that's the case, the IP addresses need to be checked.
             # -
             if (parent := check_prefix.get_parents().last()) is None:
-                return
+                continue
 
             for view in get_views_by_prefix(parent):
                 if view == self.instance:
@@ -84,7 +85,7 @@ class ViewPrefixUpdateMixin:
                     check_prefix, check_view=False
                 ):
                     try:
-                        update_dns_records(ip_address, commit=False, view=view)
+                        check_dns_records(ip_address, view=view)
                     except ValidationError as exc:
                         self.add_error("prefixes", exc.messages)
 

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/management/commands/setup_autodns.py

@@ -29,7 +29,7 @@ class Command(BaseCommand):
                     CustomField.objects.get(
                         name=cf, object_types=ipaddress_object_type
                     ).delete()
-                    if options.get("verbosity") >= 2:
+                    if options.get("verbosity"):
                         self.stdout.write(f"Custom field '{cf}' removed")
                 except CustomField.DoesNotExist:
                     pass
@@ -38,7 +38,7 @@ class Command(BaseCommand):
         # +
         # Remove pre-existing IPAM Coupling custom fields
         # -
-        if options.get("verbosity"):
+        if options.get("verbosity") >= 2:
             self.stdout.write(f"Trying to remove obsolete IPAM Coupling custom fields")
         for cf in (
             "ipaddress_dns_record_name",
@@ -48,12 +48,12 @@ class Command(BaseCommand):
                 CustomField.objects.get(
                     name=cf, object_types=ipaddress_object_type
                 ).delete()
-                if options.get("verbosity") >= 2:
+                if options.get("verbosity"):
                     self.stdout.write(f"Removed custom field '{cf}'")
             except CustomField.DoesNotExist:
                 pass
 
-        if options.get("verbosity"):
+        if options.get("verbosity") >= 2:
             self.stdout.write(f"Creating IPAM AutoDNS custom fields")
 
         if not CustomField.objects.filter(
@@ -61,7 +61,7 @@ class Command(BaseCommand):
             type=CustomFieldTypeChoices.TYPE_BOOLEAN,
             object_types=ipaddress_object_type,
         ).exists():
-            cf_disable_ptr = CustomField.objects.create(
+            cf_autodns_disabled = CustomField.objects.create(
                 name="ipaddress_dns_disabled",
                 label="Disable AutoDNS",
                 description="Disable DNS address and pointer record generation for this address",
@@ -72,15 +72,22 @@ class Command(BaseCommand):
                 is_cloneable=True,
                 weight=100,
             )
-            cf_disable_ptr.object_types.set([ipaddress_object_type])
-            if options.get("verbosity") >= 2:
+            cf_autodns_disabled.object_types.set([ipaddress_object_type])
+            if options.get("verbosity"):
                 self.stdout.write("Created custom field 'ipaddress_dns_disabled'")
 
-        if not CustomField.objects.filter(
-            name="ipaddress_dns_record_ttl",
-            type=CustomFieldTypeChoices.TYPE_INTEGER,
-            object_types=ipaddress_object_type,
-        ).exists():
+        try:
+            cf_ttl = CustomField.objects.get(
+                name="ipaddress_dns_record_ttl",
+                type=CustomFieldTypeChoices.TYPE_INTEGER,
+                object_types=ipaddress_object_type,
+            )
+            if cf_ttl.group_name != "AutoDNS":
+                cf_ttl.group_name = "AutoDNS"
+                cf_ttl.save()
+                if options.get("verbosity"):
+                    self.stdout.write("Updated custom field 'ipaddress_dns_record_ttl'")
+        except CustomField.DoesNotExist:
             cf_ttl = CustomField.objects.create(
                 name="ipaddress_dns_record_ttl",
                 description="TTL for DNS records created for this address",
@@ -94,14 +101,23 @@ class Command(BaseCommand):
                 weight=200,
             )
             cf_ttl.object_types.set([ipaddress_object_type])
-            if options.get("verbosity") >= 2:
+            if options.get("verbosity"):
                 self.stdout.write("Created custom field 'ipaddress_dns_record_ttl'")
 
-        if not CustomField.objects.filter(
-            name="ipaddress_dns_record_disable_ptr",
-            type=CustomFieldTypeChoices.TYPE_BOOLEAN,
-            object_types=ipaddress_object_type,
-        ).exists():
+        try:
+            cf_disable_ptr = CustomField.objects.get(
+                name="ipaddress_dns_record_disable_ptr",
+                type=CustomFieldTypeChoices.TYPE_BOOLEAN,
+                object_types=ipaddress_object_type,
+            )
+            if cf_disable_ptr.group_name != "AutoDNS":
+                cf_disable_ptr.group_name = "AutoDNS"
+                cf_disable_ptr.save()
+                if options.get("verbosity"):
+                    self.stdout.write(
+                        "Updated custom field 'ipaddress_dns_record_disable_ptr'"
+                    )
+        except CustomField.DoesNotExist:
             cf_disable_ptr = CustomField.objects.create(
                 name="ipaddress_dns_record_disable_ptr",
                 description="Disable DNS PTR record generation for this address",
@@ -114,7 +130,7 @@ class Command(BaseCommand):
                 weight=300,
             )
             cf_disable_ptr.object_types.set([ipaddress_object_type])
-            if options.get("verbosity") >= 2:
+            if options.get("verbosity"):
                 self.stdout.write(
                     "Created custom field 'ipaddress_dns_record_disable_ptr'"
                 )

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/models/record.py

@@ -562,13 +562,41 @@ class Record(ObjectModificationMixin, NetBoxModel):
         if self.pk is not None:
             records = records.exclude(pk=self.pk)
 
-        if len(records):
+        if records.exists():
+            if self.ipam_ip_address is not None:
+                if not records.filter(
+                    ipam_ip_address__isnull=True
+                ).exists() or get_plugin_config(
+                    "netbox_dns", "autodns_conflict_deactivate", False
+                ):
+                    return
+
             raise ValidationError(
                 {
                     "value": f"There is already an active {self.type} record for name {self.name} in zone {self.zone} with value {self.value}."
                 }
             ) from None
 
+    def handle_conflicting_address_records(self):
+        if self.ipam_ip_address is None or not self.is_active:
+            return
+
+        if not get_plugin_config("netbox_dns", "autodns_conflict_deactivate", False):
+            return
+
+        records = Record.objects.filter(
+            zone=self.zone,
+            name=self.name,
+            type=self.type,
+            value=self.value,
+            status__in=Record.ACTIVE_STATUS_LIST,
+            ipam_ip_address__isnull=True,
+        )
+
+        for record in records:
+            record.status = RecordStatusChoices.STATUS_INACTIVE
+            record.save(update_fields=["status"])
+
     def check_unique_rrset_ttl(self):
         if self.pk is not None:
             return
@@ -587,8 +615,12 @@ class Record(ObjectModificationMixin, NetBoxModel):
             )
             .exclude(ttl=self.ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
+            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
+        if self.ipam_ip_address is not None:
+            records = records.exclude(ipam_ip_address__isnull=False)
+
         if not records.exists():
             return
 
@@ -621,6 +653,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
             .exclude(pk=self.pk)
             .exclude(ttl=ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
+            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
         for record in records:
@@ -740,6 +773,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
             self.ip_address = None
 
         if self.is_address_record:
+            self.handle_conflicting_address_records()
             self.update_ptr_record(
                 update_rfc2317_cname=update_rfc2317_cname,
                 save_zone_serial=save_zone_serial,

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/models/zone.py

@@ -28,6 +28,7 @@ from netbox_dns.choices import RecordClassChoices, RecordTypeChoices, ZoneStatus
 from netbox_dns.fields import NetworkField, RFC2317NetworkField
 from netbox_dns.utilities import (
     update_dns_records,
+    check_dns_records,
     get_ip_addresses_by_zone,
     arpa_to_prefix,
     name_to_unicode,
@@ -652,6 +653,19 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                         }
                     )
 
+            if old_zone.name != self.name or old_zone.view != self.view:
+                update_ip_addresses = IPAddress.objects.filter(
+                    pk__in=self.record_set.filter(
+                        ipam_ip_address__isnull=False
+                    ).values_list("ipam_ip_address", flat=True)
+                )
+                update_ip_addresses |= get_ip_addresses_by_zone(self)
+                for ip_address in update_ip_addresses:
+                    try:
+                        check_dns_records(ip_address, zone=self)
+                    except ValidationError as exc:
+                        raise ValidationError(exc.messages)
+
         if self.is_reverse_zone:
             self.arpa_network = self.network_from_name
 

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/signals/ipam_autodns.py

@@ -11,6 +11,8 @@ from utilities.exceptions import AbortRequest
 
 from netbox_dns.models import view as _view
 from netbox_dns.utilities import (
+    check_dns_records,
+    check_record_permission,
     update_dns_records,
     delete_dns_records,
     get_views_by_prefix,
@@ -18,22 +20,52 @@ from netbox_dns.utilities import (
     get_ip_addresses_by_view,
 )
 
+AUTODNS_CUSTOM_FIELDS = {
+    "ipaddress_dns_disabled": False,
+    "ipaddress_dns_record_ttl": None,
+    "ipaddress_dns_record_disable_ptr": False,
+}
+
 
 @receiver(post_clean, sender=IPAddress)
 def ipam_autodns_ipaddress_post_clean(instance, **kwargs):
     if not isinstance(instance.address, IPNetwork):
         return
 
+    # +
+    # Check NetBox DNS record permission for changes to IPAddress custom fields
+    #
+    # Normally, as the modfication of DNS fields
+    if (request := current_request.get()) is not None:
+        cf_data = instance.custom_field_data
+        if (
+            instance.pk is not None
+            and any(
+                (
+                    cf_data.get(cf)
+                    != IPAddress.objects.get(pk=instance.pk).custom_field_data.get(cf)
+                    for cf in AUTODNS_CUSTOM_FIELDS.keys()
+                )
+            )
+            and not check_record_permission(request)
+        ) or (
+            instance.pk is None
+            and any(
+                (
+                    cf_data.get(cf) != cf_default
+                    for cf, cf_default in AUTODNS_CUSTOM_FIELDS.items()
+                )
+            )
+            and not check_record_permission(request, change=False, delete=False)
+        ):
+            raise ValidationError(
+                f"User '{request.user}' is not allowed to alter AutoDNS custom fields"
+            )
+
     try:
-        update_dns_records(instance, commit=False)
+        check_dns_records(instance)
     except ValidationError as exc:
-        if hasattr(exc, "error_dict"):
-            for field in ("name", "ttl", "value", "type"):
-                value = exc.error_dict.pop(field, None)
-                if value is not None:
-                    raise ValidationError({"dns_name": value})
-
-        raise exc
+        raise ValidationError({"dns_name": exc.messages})
 
 
 @receiver(pre_delete, sender=IPAddress)
@@ -42,8 +74,8 @@ def ipam_autodns_ipaddress_pre_delete(instance, **kwargs):
 
 
 @receiver(pre_save, sender=IPAddress)
-def ipam_autodns_ipaddress_post_save(instance, **kwargs):
-    update_dns_records(instance, commit=False)
+def ipam_autodns_ipaddress_pre_save(instance, **kwargs):
+    check_dns_records(instance)
 
 
 @receiver(post_save, sender=IPAddress)
@@ -80,7 +112,7 @@ def ipam_autodns_prefix_pre_delete(instance, **kwargs):
                 _depth=instance.depth + 1, netbox_dns_views__isnull=True
             ):
                 for ip_address in get_ip_addresses_by_prefix(prefix):
-                    update_dns_records(ip_address, commit=False)
+                    check_dns_records(ip_address)
         except ValidationError as exc:
             if request is not None:
                 raise AbortRequest(

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/templates/netbox_dns/view.html

@@ -45,15 +45,11 @@
                         {% for prefix in object.prefixes.all %}
                         <tr>
                             <td>
-                                <a href="{% url 'ipam:prefix' pk=prefix.pk %}">
-                                    {{ prefix }}
-                                </a>
+                                {{ prefix|linkify }}
                             </td>
                             {% if prefix.vrf %}
                             <td>
-                                <a href="{% url 'ipam:vrf' pk=prefix.vrf.pk %}">
-                                    {{ prefix.vrf }}
-                                </a>
+                                {{ prefix.vrf|linkify }}
                             </td>
                             {% else %}
                             <td>Global</td>

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/netbox_dns/utilities/ipam_autodns.py

@@ -7,6 +7,7 @@ from dns import name as dns_name
 from django.conf import settings
 from django.db.models import Q
 
+from netbox.context import current_request
 from ipam.models import IPAddress, Prefix
 
 from netbox_dns.models import zone as _zone
@@ -16,12 +17,14 @@ from netbox_dns.models import view as _view
 
 __all__ = (
     "get_zones",
+    "check_dns_records",
     "update_dns_records",
     "delete_dns_records",
     "get_views_by_prefix",
     "get_ip_addresses_by_prefix",
     "get_ip_addresses_by_view",
     "get_ip_addresses_by_zone",
+    "check_record_permission",
 )
 
 
@@ -82,19 +85,54 @@ def get_zones(ip_address, view=None):
     ]
 
 
-def update_dns_records(ip_address, commit=True, view=None):
+def check_dns_records(ip_address, zone=None, view=None):
     if ip_address.dns_name == "":
-        if commit:
-            delete_dns_records(ip_address)
         return
 
-    zones = get_zones(ip_address, view=view)
+    if zone is None:
+        zones = get_zones(ip_address, view=view)
+    else:
+        zones = [zone]
+
+    if ip_address.pk is not None:
+        for record in ip_address.netbox_dns_records.filter(zone__in=zones):
+            if (
+                record.fqdn != ip_address.dns_name
+                or record.value != ip_address.address.ip
+                or record.status != _get_record_status(ip_address)
+            ):
+                record.update_from_ip_address(ip_address)
+
+                if record is not None:
+                    record.clean()
+
+        zones = _zone.Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
+            pk__in=set(
+                ip_address.netbox_dns_records.all().values_list("zone", flat=True)
+            )
+        )
+
+    for zone in zones:
+        record = _record.Record.create_from_ip_address(
+            ip_address,
+            zone,
+        )
+
+        if record is not None:
+            record.clean()
+
+
+def update_dns_records(ip_address):
+    if ip_address.dns_name == "":
+        delete_dns_records(ip_address)
+        return
+
+    zones = get_zones(ip_address)
 
     if ip_address.pk is not None:
         for record in ip_address.netbox_dns_records.all():
             if record.zone not in zones:
-                if commit:
-                    record.delete()
+                record.delete()
                 continue
 
             if (
@@ -105,13 +143,12 @@ def update_dns_records(ip_address, commit=True, view=None):
                 record.update_from_ip_address(ip_address)
 
                 if record is not None:
-                    if commit:
-                        record.save()
-                    else:
-                        record.clean()
+                    record.save()
 
-        zones = set(zones).difference(
-            {record.zone for record in ip_address.netbox_dns_records.all()}
+        zones = _zone.Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
+            pk__in=set(
+                ip_address.netbox_dns_records.all().values_list("zone", flat=True)
+            )
         )
 
     for zone in zones:
@@ -121,10 +158,7 @@ def update_dns_records(ip_address, commit=True, view=None):
         )
 
         if record is not None:
-            if commit:
-                record.save()
-            else:
-                record.clean()
+            record.save()
 
 
 def delete_dns_records(ip_address):
@@ -203,3 +237,20 @@ def get_ip_addresses_by_zone(zone):
     queryset = get_ip_addresses_by_view(zone.view)
 
     return queryset.filter(dns_name__regex=rf"\.{re.escape(zone.name)}\.?$")
+
+
+def check_record_permission(add=True, change=True, delete=True):
+    checks = locals()
+
+    request = current_request.get()
+
+    if request is None:
+        return True
+
+    return all(
+        (
+            request.user.has_perm(f"nebox_dns.{perm}_record")
+            for perm, check in locals().items()
+            if check
+        )
+    )

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1.0b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "1.1.0-beta1"
+version = "1.1.0b2"
 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"
@@ -11,7 +11,7 @@ packages = [{include = "netbox_dns"}]
 exclude = ["netbox_dns/tests/*"]
 keywords = ["netbox", "netbox-plugin", "dns"]
 classifiers = [
-    "Development Status :: 4 - Beta"
+    "Development Status :: 5 - Production/Stable"
 ]
 
 [tool.poetry.dependencies]