sven
9f5e40ae48
Track the catalog zone SOA serial per view instead of a single global value. The new CatalogZone model has a 1:1 FK to netbox_dns.models.View and its own soa_serial field; each view's catalog zone now increments independently. The existing global serial is preserved during migration by copying it into every view's new CatalogZone row. Change CatalogZoneMemberIdentifier.name from globally unique to unique per catalog zone (UniqueConstraint(name, catalog_zone)) and add a catalog_zone FK to enforce it. Remove the dns-settings management command, which was a generic interface over the now-removed IntegerKeyValueSetting model. Increment both catalog zone serials when a zone moves between views: the old view's catalog zone loses a member and the new view's gains one, so both must be bumped. Also refresh the member identifier's catalog_zone FK on a view move so it does not go stale. The pre_save handler now captures _old_view_id and the post_save handler detects view changes, increments the old view's serial inside on_commit (before the new view's), and re-creates the identifier. AI generated, code manually verified.
120 lines
4.3 KiB
Python
120 lines
4.3 KiB
Python
from django.db.models.signals import pre_save, post_save, post_delete
|
|
from django.dispatch import receiver
|
|
from django.db import transaction
|
|
from django.conf import settings
|
|
from netbox.context import current_request
|
|
from netbox_dns.models import Zone, View
|
|
from netbox_dns_bridge.management.commands.dns_transfer_endpoint import catalog_zone_manager as catzm
|
|
from . import notify_handler
|
|
|
|
SETTINGS = settings.PLUGINS_CONFIG.get("netbox_dns_bridge", {})
|
|
|
|
@receiver(pre_save, sender=Zone)
|
|
def zone_pre_save(sender, instance, **kwargs):
|
|
zone = instance
|
|
if zone.pk:
|
|
try:
|
|
old = sender.objects.only("name", "soa_serial", "view_id").get(pk=zone.pk)
|
|
zone._old_name = old.name
|
|
zone._old_soa_serial = old.soa_serial
|
|
zone._old_view_id = old.view_id
|
|
except sender.DoesNotExist:
|
|
zone._old_name = None
|
|
zone._old_soa_serial = None
|
|
zone._old_view_id = None
|
|
else:
|
|
zone._old_name = None
|
|
zone._old_soa_serial = None
|
|
zone._old_view_id = None
|
|
|
|
|
|
@receiver(post_save, sender=Zone)
|
|
def zone_post_save(sender, instance, created, **kwargs):
|
|
zone = instance
|
|
|
|
# Quit if this is not the first signal in this session for this zone.
|
|
try:
|
|
request = current_request.get()
|
|
if request is None:
|
|
raise LookupError
|
|
handled_zones = getattr(request, "_handled_zones", set())
|
|
if zone.pk in handled_zones:
|
|
return
|
|
handled_zones.add(zone.pk)
|
|
request._handled_zones = handled_zones
|
|
except LookupError:
|
|
pass
|
|
|
|
# Determine whether the zone's SOA serial number changed with this save.
|
|
# A newly created zone is always considered to have a "changed" serial.
|
|
old_soa_serial = getattr(zone, "_old_soa_serial", None)
|
|
new_soa_serial = getattr(zone, "soa_serial", None)
|
|
soa_serial_changed = created or (old_soa_serial != new_soa_serial)
|
|
|
|
# Detect whether the zone moved between views. When it does, the old
|
|
# view's catalog zone loses a member and the new view's gains one, so
|
|
# both serials must be incremented.
|
|
old_view_id = getattr(zone, "_old_view_id", None)
|
|
view_changed = (
|
|
not created
|
|
and old_view_id is not None
|
|
and old_view_id != zone.view_id
|
|
)
|
|
|
|
# On commit, increment soa serial and if notify is enabled, schedule bg job.
|
|
def _on_commit():
|
|
if view_changed:
|
|
try:
|
|
old_view = View.objects.get(pk=old_view_id)
|
|
catzm.increment_soa_serial(old_view)
|
|
except View.DoesNotExist:
|
|
pass
|
|
catzm.increment_soa_serial(zone.view)
|
|
|
|
if SETTINGS.get("notify_clients", False):
|
|
notify_handler.schedule_client_notify(zone)
|
|
|
|
# Send a NOTIFY to the zone's own nameservers when its SOA serial changed
|
|
# and the feature is enabled — globally or per zone via a custom field.
|
|
if soa_serial_changed and _notify_ns_enabled(zone):
|
|
notify_handler.schedule_ns_notify(zone)
|
|
|
|
transaction.on_commit(_on_commit)
|
|
|
|
if created:
|
|
# If zone was created, create catz member identifier record for this zone.
|
|
catzm.update_member_identifier(zone)
|
|
else:
|
|
# Re-create the catz member identifier when the zone name or its view
|
|
# changed. A view move leaves the identifier pointing at the wrong
|
|
# catalog zone, so it must be refreshed.
|
|
old_name = getattr(zone, "_old_name", None)
|
|
if (old_name and zone.name != old_name) or view_changed:
|
|
catzm.update_member_identifier(zone)
|
|
|
|
|
|
@receiver(post_delete, sender=Zone)
|
|
def zone_post_delete(sender, instance, **kwargs):
|
|
def _on_commit():
|
|
catzm.increment_soa_serial(instance.view)
|
|
|
|
transaction.on_commit(_on_commit)
|
|
|
|
|
|
def _notify_ns_enabled(zone) -> bool:
|
|
"""Return True if a NOTIFY to the zone's nameservers should be sent.
|
|
|
|
Enabled either globally for every zone via ``notify_ns_all_zones`` or per
|
|
zone when the boolean custom field named by ``notify_ns_custom_field_name``
|
|
is set to True on the zone.
|
|
"""
|
|
if SETTINGS.get("notify_ns_all_zones", False):
|
|
return True
|
|
|
|
cf_name = SETTINGS.get("notify_ns_custom_field_name")
|
|
if not cf_name:
|
|
return False
|
|
|
|
custom_fields = getattr(zone, "custom_field_data", None) or {}
|
|
return custom_fields.get(cf_name) is True
|