netbox-plugin-dns 1.0b2__py3-none-any.whl → 1.0.2__py3-none-any.whl

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,
@@ -55,7 +56,7 @@ class NameServer(NetBoxModel):
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:nameserver", kwargs={"pk": self.pk})
 
-    def clean(self):
+    def clean(self, *args, **kwargs):
         try:
             self.name = normalize_name(self.name)
         except NameFormatError as exc:
@@ -74,17 +75,17 @@ class NameServer(NetBoxModel):
                 }
             ) from None
 
+        super().clean(*args, **kwargs)
+
     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

@@ -11,11 +11,10 @@ from django.urls import reverse
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
+from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
 from utilities.choices import ChoiceSet
 
-from netbox.plugins.utils import get_plugin_config
-
 from netbox_dns.fields import AddressField
 from netbox_dns.utilities import (
     arpa_to_prefix,
@@ -24,7 +23,9 @@ from netbox_dns.utilities import (
 from netbox_dns.validators import (
     validate_fqdn,
     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]}..."
 
@@ -234,8 +238,8 @@ class Record(NetBoxModel):
         if self.type != RecordTypeChoices.CNAME:
             return None
 
-        zone = dns_name.from_text(self.zone.name)
-        value_fqdn = dns_name.from_text(self.value, origin=zone)
+        _zone = dns_name.from_text(self.zone.name)
+        value_fqdn = dns_name.from_text(self.value, origin=_zone)
 
         return value_fqdn.to_text()
 
@@ -287,12 +291,14 @@ class Record(NetBoxModel):
                 dns_name.from_text(self.ptr_record.zone.rfc2317_parent_zone.name)
             )
 
+        return None
+
     @property
     def ptr_zone(self):
         if self.type == RecordTypeChoices.A:
             ptr_zone = (
                 zone.Zone.objects.filter(
-                    self.zone.view_filter,
+                    view=self.zone.view,
                     rfc2317_prefix__net_contains=self.value,
                 )
                 .order_by("rfc2317_prefix__net_mask_length")
@@ -304,7 +310,7 @@ class Record(NetBoxModel):
 
         ptr_zone = (
             zone.Zone.objects.filter(
-                self.zone.view_filter, arpa_network__net_contains=self.value
+                view=self.zone.view, arpa_network__net_contains=self.value
             )
             .order_by("arpa_network__net_mask_length")
             .last()
@@ -319,7 +325,7 @@ class Record(NetBoxModel):
             ptr_zone is None
             or self.disable_ptr
             or not self.is_active
-            or self.name == "*"
+            or self.name.startswith("*")
         ):
             if self.ptr_record is not None:
                 with transaction.atomic():
@@ -418,10 +424,8 @@ class Record(NetBoxModel):
                     self.rfc2317_cname_record.save(save_zone_serial=save_zone_serial)
 
                     return
-                else:
-                    self.remove_from_rfc2317_cname_record(
-                        save_zone_serial=save_zone_serial
-                    )
+
+                self.remove_from_rfc2317_cname_record(save_zone_serial=save_zone_serial)
 
             rfc2317_cname_record = Record.objects.filter(
                 name=cname_name,
@@ -462,14 +466,14 @@ class Record(NetBoxModel):
 
     def validate_name(self):
         try:
-            zone = dns_name.from_text(self.zone.name, origin=dns_name.root)
+            _zone = dns_name.from_text(self.zone.name, origin=dns_name.root)
             name = dns_name.from_text(self.name, origin=None)
-            fqdn = dns_name.from_text(self.name, origin=zone)
+            fqdn = dns_name.from_text(self.name, origin=_zone)
 
-            zone.to_unicode()
+            _zone.to_unicode()
             name.to_unicode()
 
-            self.name = name.relativize(zone).to_text()
+            self.name = name.relativize(_zone).to_text()
             self.fqdn = fqdn.to_text()
 
         except dns.exception.DNSException as exc:
@@ -479,7 +483,7 @@ class Record(NetBoxModel):
                 }
             )
 
-        if not fqdn.is_subdomain(zone):
+        if not fqdn.is_subdomain(_zone):
             raise ValidationError(
                 {
                     "name": f"{self.name} is not a name in {self.zone.name}",
@@ -487,7 +491,7 @@ class Record(NetBoxModel):
             )
 
         if self.type not in get_plugin_config(
-            "netbox_dns", "tolerate_non_rfc1035_types", default=list()
+            "netbox_dns", "tolerate_non_rfc1035_types", default=[]
         ):
             try:
                 validate_extended_hostname(
@@ -497,7 +501,7 @@ class Record(NetBoxModel):
                         in get_plugin_config(
                             "netbox_dns",
                             "tolerate_leading_underscore_types",
-                            default=list(),
+                            default=[],
                         )
                     ),
                 )
@@ -509,18 +513,16 @@ class Record(NetBoxModel):
                 ) from None
 
     def validate_value(self):
-        if self.type in (RecordTypeChoices.PTR):
+        def _validate_idn(name):
             try:
-                validate_fqdn(self.value)
-            except ValidationError as exc:
+                name.to_unicode()
+            except dns_name.IDNAException as exc:
                 raise ValidationError(
-                    {
-                        "value": exc,
-                    }
+                    f"{name.to_text()} is not a valid IDN: {exc}."
                 ) from None
 
         try:
-            rdata.from_text(RecordClassChoices.IN, self.type, self.value)
+            rr = rdata.from_text(RecordClassChoices.IN, self.type, self.value)
         except dns.exception.SyntaxError as exc:
             raise ValidationError(
                 {
@@ -528,6 +530,59 @@ class Record(NetBoxModel):
                 }
             ) from None
 
+        try:
+            match self.type:
+                case RecordTypeChoices.CNAME:
+                    _validate_idn(rr.target)
+                    validate_domain_name(
+                        rr.target.to_text(),
+                        always_tolerant=True,
+                        allow_empty_label=True,
+                    )
+
+                case (
+                    RecordTypeChoices.DNAME
+                    | RecordTypeChoices.NS
+                    | RecordTypeChoices.HTTPS
+                    | RecordTypeChoices.SRV
+                    | RecordTypeChoices.SVCB
+                ):
+                    _validate_idn(rr.target)
+                    validate_domain_name(rr.target.to_text(), always_tolerant=True)
+
+                case RecordTypeChoices.PTR | RecordTypeChoices.NSAP_PTR:
+                    _validate_idn(rr.target)
+                    validate_fqdn(rr.target.to_text(), always_tolerant=True)
+
+                case RecordTypeChoices.MX | RecordTypeChoices.RT | RecordTypeChoices.KX:
+                    _validate_idn(rr.exchange)
+                    validate_domain_name(rr.exchange.to_text(), always_tolerant=True)
+
+                case RecordTypeChoices.NSEC:
+                    _validate_idn(rr.next)
+                    validate_domain_name(rr.next.to_text(), always_tolerant=True)
+
+                case RecordTypeChoices.RP:
+                    _validate_idn(rr.mbox)
+                    validate_domain_name(rr.mbox.to_text(), always_tolerant=True)
+                    _validate_idn(rr.txt)
+                    validate_domain_name(rr.txt.to_text(), always_tolerant=True)
+
+                case RecordTypeChoices.NAPTR:
+                    _validate_idn(rr.replacement)
+                    validate_extended_hostname(
+                        rr.replacement.to_text(), always_tolerant=True
+                    )
+
+                case RecordTypeChoices.PX:
+                    _validate_idn(rr.map822)
+                    validate_domain_name(rr.map822.to_text(), always_tolerant=True)
+                    _validate_idn(rr.mapx400)
+                    validate_domain_name(rr.mapx400.to_text(), always_tolerant=True)
+
+        except ValidationError as exc:
+            raise ValidationError({"value": exc}) from None
+
     def check_unique_record(self):
         if not get_plugin_config("netbox_dns", "enforce_unique_records", False):
             return
@@ -695,6 +750,8 @@ class Record(NetBoxModel):
                     }
                 ) from None
 
+        super().clean(*args, **kwargs)
+
     def save(
         self,
         *args,
@@ -730,11 +787,13 @@ 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:
-            zone.update_serial(save_zone_serial=save_zone_serial)
+        _zone = self.zone
+        if self.type != RecordTypeChoices.SOA and _zone.soa_serial_auto:
+            _zone.update_serial(save_zone_serial=save_zone_serial)
 
     def delete(self, *args, save_zone_serial=True, **kwargs):
         if self.rfc2317_cname_record:
@@ -745,9 +804,9 @@ class Record(NetBoxModel):
 
         super().delete(*args, **kwargs)
 
-        zone = self.zone
-        if zone.soa_serial_auto:
-            zone.update_serial(save_zone_serial=save_zone_serial)
+        _zone = self.zone
+        if _zone.soa_serial_auto:
+            _zone.update_serial(save_zone_serial=save_zone_serial)
 
 
 @register_search

netbox_dns/models/view.py

@@ -1,11 +1,16 @@
 from django.db import models
 from django.urls import reverse
+from django.core.exceptions import ValidationError
 
 from netbox.models import NetBoxModel
 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,
@@ -14,6 +19,9 @@ class View(NetBoxModel):
         max_length=200,
         blank=True,
     )
+    default_view = models.BooleanField(
+        default=False,
+    )
     tenant = models.ForeignKey(
         to="tenancy.Tenant",
         on_delete=models.PROTECT,
@@ -24,6 +32,10 @@ class View(NetBoxModel):
 
     clone_fields = ["name", "description"]
 
+    @classmethod
+    def get_default_view(cls):
+        return cls.objects.get(default_view=True)
+
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:view", kwargs={"pk": self.pk})
 
@@ -33,6 +45,49 @@ class View(NetBoxModel):
     class Meta:
         ordering = ("name",)
 
+    def delete(self, *args, **kwargs):
+        if self.default_view:
+            if current_request.get() is not None:
+                raise AbortRequest("The default view cannot be deleted")
+
+            raise ValidationError("The default view cannot be deleted")
+
+        super().delete(*args, **kwargs)
+
+    def clean(self, *args, old_state=None, **kwargs):
+        if (changed_fields := self.changed_fields) is None:
+            return
+
+        if (
+            "default_view" in changed_fields
+            and not self.default_view
+            and not View.objects.filter(default_view=True).exclude(pk=self.pk).exists()
+        ):
+            raise ValidationError(
+                {
+                    "default_view": "Please select a different view as default view to change this setting!"
+                }
+            )
+
+        super().clean(*args, **kwargs)
+
+    def save(self, *args, **kwargs):
+        self.clean()
+
+        changed_fields = self.changed_fields
+
+        super().save(*args, **kwargs)
+
+        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:
+                view.default_view = False
+                view.save()
+
 
 @register_search
 class ViewIndex(SearchIndex):