netbox-plugin-dns 1.0.7__py3-none-any.whl → 1.1.0__py3-none-any.whl

netbox_dns/models/zone.py

@@ -3,9 +3,8 @@ from math import ceil
 from datetime import datetime
 
 from dns import name as dns_name
-from dns.rdtypes.ANY import SOA
 from dns.exception import DNSException
-
+from dns.rdtypes.ANY import SOA
 from django.core.validators import (
     MinValueValidator,
     MaxValueValidator,
@@ -28,13 +27,15 @@ from ipam.models import IPAddress
 from netbox_dns.choices import RecordClassChoices, RecordTypeChoices, ZoneStatusChoices
 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,
     normalize_name,
     NameFormatError,
 )
 from netbox_dns.validators import (
-    validate_fqdn,
     validate_rname,
     validate_domain_name,
 )
@@ -77,6 +78,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         super().__init__(*args, **kwargs)
 
         self._soa_serial_dirty = False
+        self._ip_addresses_checked = False
 
     view = models.ForeignKey(
         to="View",
@@ -190,7 +192,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
     registrant = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Registrant",
         help_text="The owner of the domain",
@@ -198,7 +200,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
     admin_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Admin Contact",
         related_name="admin_c_zones",
@@ -207,16 +209,16 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
     tech_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
-        verbose_name="Tech Contact",
+        verbose_name="Technical Contact",
         related_name="tech_c_zones",
         help_text="The technical contact for the domain",
         blank=True,
         null=True,
     )
     billing_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Billing Contact",
         related_name="billing_c_zones",
@@ -282,7 +284,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         else:
             try:
                 name = dns_name.from_text(self.name, origin=None).to_unicode()
-            except dns_name.IDNAException:
+            except DNSException:
                 name = self.name
 
         try:
@@ -310,6 +312,14 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def soa_serial_dirty(self, soa_serial_dirty):
         self._soa_serial_dirty = soa_serial_dirty
 
+    @property
+    def ip_addresses_checked(self):
+        return self._ip_addresses_checked
+
+    @ip_addresses_checked.setter
+    def ip_addresses_checked(self, ip_addresses_checked):
+        self._ip_addresses_checked = ip_addresses_checked
+
     @property
     def display_name(self):
         return name_to_unicode(self.name)
@@ -655,6 +665,26 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                         }
                     )
 
+            if (
+                not self.ip_addresses_checked
+                and old_zone.name != self.name
+                or old_zone.view != self.view
+            ):
+                ip_addresses = IPAddress.objects.filter(
+                    netbox_dns_records__in=self.record_set.filter(
+                        ipam_ip_address__isnull=False
+                    )
+                )
+                ip_addresses |= get_ip_addresses_by_zone(self)
+
+                for ip_address in ip_addresses.distinct():
+                    try:
+                        check_dns_records(ip_address, zone=self)
+                    except ValidationError as exc:
+                        raise ValidationError(exc.messages)
+
+                self.ip_addresses_checked = True
+
         if self.is_reverse_zone:
             self.arpa_network = self.network_from_name
 
@@ -769,23 +799,13 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         elif changed_fields is not None and {"name", "view", "status"} & changed_fields:
             for address_record in self.record_set.filter(
-                type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA)
+                type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
+                ipam_ip_address__isnull=True,
             ):
                 address_record.save(update_fields=["ptr_record"])
 
-            # Fix name in IP Address when zone name is changed
-            if (
-                get_plugin_config("netbox_dns", "feature_ipam_coupling")
-                and "name" in changed_fields
-            ):
-                for ip in IPAddress.objects.filter(
-                    custom_field_data__ipaddress_dns_zone_id=self.pk
-                ):
-                    ip.dns_name = f'{ip.custom_field_data["ipaddress_dns_record_name"]}.{self.name}'
-                    ip.save(update_fields=["dns_name"])
-
         if changed_fields is not None and "name" in changed_fields:
-            for _record in self.record_set.all():
+            for _record in self.record_set.filter(ipam_ip_address__isnull=True):
                 _record.save(
                     update_fields=["fqdn"],
                     save_zone_serial=False,
@@ -793,6 +813,17 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                     update_rfc2317_cname=False,
                 )
 
+        if changed_fields is None or {"name", "view"} & changed_fields:
+            ip_addresses = IPAddress.objects.filter(
+                netbox_dns_records__in=self.record_set.filter(
+                    ipam_ip_address__isnull=False
+                )
+            )
+            ip_addresses |= get_ip_addresses_by_zone(self)
+
+            for ip_address in ip_addresses.distinct():
+                update_dns_records(ip_address)
+
         self.save_soa_serial()
         self.update_soa_record()
 
@@ -828,14 +859,15 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 self.rfc2317_child_zones.all().values_list("pk", flat=True)
             )
 
-            if get_plugin_config("netbox_dns", "feature_ipam_coupling"):
-                for ip in IPAddress.objects.filter(
-                    custom_field_data__ipaddress_dns_zone_id=self.pk
-                ):
-                    ip.dns_name = ""
-                    ip.custom_field_data["ipaddress_dns_record_name"] = None
-                    ip.custom_field_data["ipaddress_dns_zone_id"] = None
-                    ip.save(update_fields=["dns_name", "custom_field_data"])
+            ipam_ip_addresses = list(
+                IPAddress.objects.filter(
+                    netbox_dns_records__in=self.record_set.filter(
+                        ipam_ip_address__isnull=False
+                    )
+                )
+                .distinct()
+                .values_list("pk", flat=True)
+            )
 
             super().delete(*args, **kwargs)
 
@@ -849,6 +881,10 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             address_zone.save_soa_serial()
             address_zone.update_soa_record()
 
+        ip_addresses = IPAddress.objects.filter(pk__in=ipam_ip_addresses)
+        for ip_address in ip_addresses:
+            update_dns_records(ip_address)
+
         rfc2317_child_zones = Zone.objects.filter(pk__in=rfc2317_child_zones)
         if rfc2317_child_zones:
             for child_zone in rfc2317_child_zones:

netbox_dns/models/zone_template.py

@@ -47,7 +47,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     registrant = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         related_name="+",
         help_text="The owner of the domain",
@@ -55,7 +55,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     admin_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Admin contact",
         related_name="+",
@@ -64,7 +64,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     tech_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Tech contact",
         related_name="+",
@@ -73,7 +73,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     billing_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Billing contact",
         related_name="+",

netbox_dns/navigation.py

@@ -151,21 +151,21 @@ registrar_menu_item = PluginMenuItem(
 )
 
 contact_menu_item = PluginMenuItem(
-    link="plugins:netbox_dns:contact_list",
-    link_text="Contacts",
-    permissions=["netbox_dns.view_contact"],
+    link="plugins:netbox_dns:registrationcontact_list",
+    link_text="Registration Contacts",
+    permissions=["netbox_dns.view_registrationcontact"],
     buttons=(
         PluginMenuButton(
-            "plugins:netbox_dns:contact_add",
+            "plugins:netbox_dns:registrationcontact_add",
             "Add",
             "mdi mdi-plus-thick",
-            permissions=["netbox_dns.add_contact"],
+            permissions=["netbox_dns.add_registrationcontact"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:contact_import",
+            "plugins:netbox_dns:registrationcontact_import",
             "Import",
             "mdi mdi-upload",
-            permissions=["netbox_dns.add_contact"],
+            permissions=["netbox_dns.add_registrationcontact"],
         ),
     ),
 )

netbox_dns/signals/ipam_dnssync.py

@@ -0,0 +1,224 @@
+from netaddr import IPNetwork
+
+from django.conf import settings
+from django.dispatch import receiver
+from django.db.models.signals import pre_delete, pre_save, post_save, m2m_changed
+from django.core.exceptions import ValidationError
+
+from netbox.context import current_request
+from netbox.signals import post_clean
+from ipam.models import IPAddress, Prefix
+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,
+    get_ip_addresses_by_prefix,
+)
+
+DNSSYNC_CUSTOM_FIELDS = {
+    "ipaddress_dns_disabled": False,
+    "ipaddress_dns_record_ttl": None,
+    "ipaddress_dns_record_disable_ptr": False,
+}
+
+IPADDRESS_ACTIVE_STATUS = settings.PLUGINS_CONFIG["netbox_dns"][
+    "dnssync_ipaddress_active_status"
+]
+ENFORCE_UNIQUE_RECORDS = settings.PLUGINS_CONFIG["netbox_dns"]["enforce_unique_records"]
+
+
+@receiver(post_clean, sender=IPAddress)
+def ipam_dnssync_ipaddress_post_clean(instance, **kwargs):
+    if not isinstance(instance.address, IPNetwork):
+        return
+
+    if instance.custom_field_data.get("ipaddress_dns_disabled"):
+        return
+
+    # +
+    # Check for uniqueness of IP address and dns_name. If unique records are
+    # enforced, report an error when trying to create the same IP address with
+    # the same dns_name. Ignore existing IP addresses that have their CF
+    # "ipaddress_dns_disabled" set to "True".
+    # -
+    duplicate_addresses = IPAddress.objects.filter(
+        address=instance.address,
+        vrf=instance.vrf,
+        dns_name=instance.dns_name,
+        status__in=IPADDRESS_ACTIVE_STATUS,
+    )
+    if instance.pk is not None:
+        duplicate_addresses = duplicate_addresses.exclude(pk=instance.pk)
+
+    if ENFORCE_UNIQUE_RECORDS and instance.status in IPADDRESS_ACTIVE_STATUS:
+        for ip_address in duplicate_addresses.only("custom_field_data"):
+            if not ip_address.custom_field_data.get("ipaddress_dns_disabled"):
+                raise ValidationError(
+                    {
+                        "dns_name": "Unique DNS records are enforced and there is already "
+                        f"an active IP address {instance.address} with DNS name {instance.dns_name}. "
+                        "Plesase choose a different name or disable record creation for this "
+                        "IP address."
+                    }
+                )
+
+    # +
+    # 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, cf_default)
+                    != IPAddress.objects.get(pk=instance.pk).custom_field_data.get(
+                        cf, cf_default
+                    )
+                    for cf, cf_default in DNSSYNC_CUSTOM_FIELDS.items()
+                )
+            )
+            and not check_record_permission()
+        ) or (
+            instance.pk is None
+            and any(
+                (
+                    cf_data.get(cf, cf_default) != cf_default
+                    for cf, cf_default in DNSSYNC_CUSTOM_FIELDS.items()
+                )
+            )
+            and not check_record_permission(change=False, delete=False)
+        ):
+            raise ValidationError(
+                f"User '{request.user}' is not allowed to alter DNSsync custom fields"
+            )
+
+    try:
+        check_dns_records(instance)
+    except ValidationError as exc:
+        raise ValidationError({"dns_name": exc.messages})
+
+
+@receiver(pre_delete, sender=IPAddress)
+def ipam_dnssync_ipaddress_pre_delete(instance, **kwargs):
+    delete_dns_records(instance)
+
+
+@receiver(pre_save, sender=IPAddress)
+def ipam_dnssync_ipaddress_pre_save(instance, **kwargs):
+    check_dns_records(instance)
+
+
+@receiver(post_save, sender=IPAddress)
+def ipam_dnssync_ipaddress_post_save(instance, **kwargs):
+    update_dns_records(instance)
+
+
+@receiver(pre_save, sender=Prefix)
+def ipam_dnssync_prefix_pre_save(instance, **kwargs):
+    """
+    Changes that modify the prefix hierarchy cannot be validated properly before
+    commiting them. So the solution in this case is to ask the user to deassign
+    the prefix from any views it is assigned to and retry.
+    """
+    request = current_request.get()
+
+    if instance.pk is None or not instance.netbox_dns_views.exists():
+        return
+
+    saved_prefix = Prefix.objects.prefetch_related("netbox_dns_views").get(
+        pk=instance.pk
+    )
+    if saved_prefix.prefix != instance.prefix or saved_prefix.vrf != instance.vrf:
+        dns_views = ", ".join([view.name for view in instance.netbox_dns_views.all()])
+        if request is not None:
+            raise AbortRequest(
+                f"This prefix is currently assigned to the following DNS views: {dns_views}"
+                f"Please deassign it from these views before making changes to the prefix "
+                f"or VRF."
+            )
+
+        raise ValidationError(
+            f"Prefix is assigned to DNS views {dns_views}. Prefix and VRF must not be changed"
+        )
+
+
+@receiver(pre_delete, sender=Prefix)
+def ipam_dnssync_prefix_pre_delete(instance, **kwargs):
+    parent = instance.get_parents().last()
+    request = current_request.get()
+
+    if parent is not None and get_views_by_prefix(instance) != get_views_by_prefix(
+        parent
+    ):
+        try:
+            for prefix in instance.get_children().filter(
+                _depth=instance.depth + 1, netbox_dns_views__isnull=True
+            ):
+                for ip_address in get_ip_addresses_by_prefix(prefix):
+                    check_dns_records(ip_address)
+        except ValidationError as exc:
+            if request is not None:
+                raise AbortRequest(
+                    f"Prefix deletion would cause DNS errors: {exc.messages[0]} "
+                    "Please review DNS View assignments for this and the parent prefix"
+                )
+            else:
+                raise exc
+
+    # +
+    # CAUTION: This only works because the NetBox workaround for an ancient
+    # Django bug (see https://code.djangoproject.com/ticket/17688) has already
+    # removed the relations between the prefix and the views when this signal
+    # handler runs.
+    #
+    # Should anything be fixed, this code will stop working and need to be
+    # revisited.
+    #
+    # The NetBox workaround only works for requests, not for model level
+    # operations. The following code replicates it for non-requests.
+    # -
+    if request is None:
+        for view in instance.netbox_dns_views.all():
+            view.snapshot()
+            view.prefixes.remove(instance)
+
+    for ip_address in get_ip_addresses_by_prefix(instance):
+        update_dns_records(ip_address)
+
+
+@receiver(m2m_changed, sender=_view.View.prefixes.through)
+def ipam_dnssync_view_prefix_changed(**kwargs):
+    action = kwargs.get("action")
+    request = current_request.get()
+
+    # +
+    # Handle all post_add and post_remove signals except the ones directly
+    # handled by the pre_delete handler for the Prefix model.
+    #
+    # Yes. This IS ugly.
+    # -
+    if action not in ("post_add", "post_remove") or (
+        request is not None
+        and action == "post_remove"
+        and (
+            request.path.startswith("/ipam/prefixes/")
+            or request.path.startswith("/api/ipam/prefixes/")
+        )
+    ):
+        return
+
+    check_view = action != "post_remove"
+
+    ip_addresses = IPAddress.objects.none()
+    for prefix in Prefix.objects.filter(pk__in=kwargs.get("pk_set")):
+        ip_addresses |= get_ip_addresses_by_prefix(prefix, check_view=check_view)
+
+    for ip_address in ip_addresses.distinct():
+        update_dns_records(ip_address)

netbox_dns/tables/__init__.py

@@ -2,7 +2,7 @@ from .view import *
 from .zone import *
 from .nameserver import *
 from .record import *
-from .contact import *
+from .registration_contact import *
 from .registrar import *
 from .zone_template import *
 from .record_template import *

netbox_dns/tables/ipam_dnssync.py

@@ -0,0 +1,11 @@
+import django_tables2 as tables
+
+from ipam.tables import PrefixTable
+from utilities.tables import register_table_column
+
+views = tables.ManyToManyColumn(
+    verbose_name="DNS Views",
+    linkify_item=True,
+)
+
+register_table_column(views, "netbox_dns_views", PrefixTable)

netbox_dns/tables/record.py

@@ -1,4 +1,6 @@
 import django_tables2 as tables
+from django.utils.html import format_html
+
 
 from netbox.tables import (
     NetBoxTable,
@@ -11,6 +13,10 @@ from tenancy.tables import TenancyColumnsMixin
 from netbox_dns.models import Record
 from netbox_dns.utilities import value_to_unicode
 
+import logging
+
+logger = logging.getLogger("netbox_dns")
+
 
 __all__ = (
     "RecordTable",
@@ -96,6 +102,11 @@ class ManagedRecordTable(RecordBaseTable):
         verbose_name="IPAM IP Address",
         linkify=True,
     )
+    related_ip_address = tables.Column(
+        verbose_name="Related IP Address",
+        empty_values=(),
+        orderable=False,
+    )
     actions = ActionsColumn(actions=("changelog",))
 
     class Meta(NetBoxTable.Meta):
@@ -110,6 +121,28 @@ class ManagedRecordTable(RecordBaseTable):
             "active",
         )
 
+    def render_related_ip_address(self, record):
+        if record.ipam_ip_address is not None:
+            address = record.ipam_ip_address
+        elif (
+            hasattr(record, "address_record")
+            and record.address_record.ipam_ip_address is not None
+        ):
+            address = record.address_record.ipam_ip_address
+        else:
+            return format_html("—")
+
+        return format_html(f"<a href='{address.get_absolute_url()}'>{address}</a>")
+
+    def value_related_ip_address(self, record):
+        if record.ipam_ip_address is not None:
+            return record.ipam_ip_address
+        elif (
+            hasattr(record, "address_record")
+            and record.address_record.ipam_ip_address is not None
+        ):
+            return record.address_record.ipam_ip_address
+
 
 class RelatedRecordTable(RecordBaseTable):
     actions = ActionsColumn(actions=())

netbox_dns/tables/{contact.py → registration_contact.py}

@@ -2,22 +2,22 @@ import django_tables2 as tables
 
 from netbox.tables import NetBoxTable, TagColumn
 
-from netbox_dns.models import Contact
+from netbox_dns.models import RegistrationContact
 
 
-__all__ = ("ContactTable",)
+__all__ = ("RegistrationContactTable",)
 
 
-class ContactTable(NetBoxTable):
+class RegistrationContactTable(NetBoxTable):
     contact_id = tables.Column(
         linkify=True,
     )
     tags = TagColumn(
-        url_name="plugins:netbox_dns:contact_list",
+        url_name="plugins:netbox_dns:registrationcontact_list",
     )
 
     class Meta(NetBoxTable.Meta):
-        model = Contact
+        model = RegistrationContact
         fields = (
             "name",
             "description",

netbox_dns/tables/view.py

@@ -1,12 +1,15 @@
 import django_tables2 as tables
 
-from netbox.tables import NetBoxTable, TagColumn
+from netbox.tables import NetBoxTable, TagColumn, ActionsColumn
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import View
 
 
-__all__ = ("ViewTable",)
+__all__ = (
+    "ViewTable",
+    "RelatedViewTable",
+)
 
 
 class ViewTable(TenancyColumnsMixin, NetBoxTable):
@@ -22,3 +25,22 @@ class ViewTable(TenancyColumnsMixin, NetBoxTable):
         model = View
         fields = ("description",)
         default_columns = ("name", "default_view")
+
+
+class RelatedViewTable(TenancyColumnsMixin, NetBoxTable):
+    actions = ActionsColumn(actions=())
+
+    name = tables.Column(
+        linkify=True,
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = View
+        fields = (
+            "name",
+            "description",
+            "tenant",
+            "tenant_group",
+            "tags",
+        )
+        default_columns = ("name", "description")