netbox-plugin-dns 0.22.6__tar.gz → 0.22.9__tar.gz

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.22.6
+Version: 0.22.9
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/__init__.py

@@ -10,7 +10,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.22.6"
+__version__ = "0.22.9"
 
 
 class DNSConfig(PluginConfig):
@@ -18,6 +18,7 @@ class DNSConfig(PluginConfig):
     verbose_name = "NetBox DNS"
     description = "NetBox plugin for DNS data"
     min_version = "3.5.0"
+    max_version = "3.99.0"
     version = __version__
     author = "Peter Eckel"
     author_email = "pete@netbox-dns.org"

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/api/serializers.py

@@ -241,6 +241,7 @@ class RecordSerializer(NetBoxModelSerializer):
             "display",
             "type",
             "name",
+            "fqdn",
             "value",
             "status",
             "ttl",

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/filters/record.py

@@ -3,17 +3,22 @@ from django.db.models import Q
 
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
+from utilities.filters import MultiValueCharFilter
 
-from netbox_dns.models import View, Zone, Record, RecordTypeChoices
+from netbox_dns.models import View, Zone, Record, RecordTypeChoices, RecordStatusChoices
 
 
 class RecordFilter(TenancyFilterSet, NetBoxModelFilterSet):
-    """Filter capabilities for Record instances."""
-
+    fqdn = MultiValueCharFilter(
+        method="filter_fqdn",
+    )
     type = django_filters.MultipleChoiceFilter(
         choices=RecordTypeChoices,
         null_value=None,
     )
+    status = django_filters.MultipleChoiceFilter(
+        choices=RecordStatusChoices,
+    )
     zone_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Zone.objects.all(),
         label="Parent Zone ID",
@@ -39,10 +44,31 @@ class RecordFilter(TenancyFilterSet, NetBoxModelFilterSet):
 
     class Meta:
         model = Record
-        fields = ("id", "type", "name", "value", "status", "zone", "managed", "tenant")
+        fields = (
+            "id",
+            "type",
+            "name",
+            "fqdn",
+            "value",
+            "status",
+            "zone",
+            "managed",
+            "tenant",
+        )
+
+    def filter_fqdn(self, queryset, name, value):
+        if not value:
+            return queryset
+
+        fqdns = []
+        for fqdn in value:
+            if not fqdn.endswith("."):
+                fqdn = fqdn + "."
+            fqdns.append(fqdn)
+
+        return queryset.filter(fqdn__in=fqdns)
 
     def search(self, queryset, name, value):
-        """Perform the filtered search."""
         if not value.strip():
             return queryset
         qs_filter = (

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/filters/zone.py

@@ -8,7 +8,7 @@ from netbox_dns.models import View, Zone, ZoneStatusChoices, Registrar, Contact
 
 
 class ZoneFilter(TenancyFilterSet, NetBoxModelFilterSet):
-    status = django_filters.ChoiceFilter(
+    status = django_filters.MultipleChoiceFilter(
         choices=ZoneStatusChoices,
     )
     view_id = django_filters.ModelMultipleChoiceFilter(

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/forms/record.py

@@ -79,24 +79,31 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Record
     fieldsets = (
         (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("view_id", "zone_id", "name", "type", "value", "status")),
+        (
+            "Attributes",
+            ("view_id", "zone_id", "name", "fqdn", "type", "value", "status"),
+        ),
         ("Tenant", ("tenant_group_id", "tenant_id")),
     )
 
     type = forms.MultipleChoiceField(
-        choices=add_blank_choice(RecordTypeChoices),
+        choices=RecordTypeChoices,
         required=False,
     )
     name = forms.CharField(
         required=False,
         label="Name",
     )
+    fqdn = forms.CharField(
+        required=False,
+        label="FQDN",
+    )
     value = forms.CharField(
         required=False,
         label="Value",
     )
-    status = forms.ChoiceField(
-        choices=add_blank_choice(RecordStatusChoices),
+    status = forms.MultipleChoiceField(
+        choices=RecordStatusChoices,
         required=False,
     )
     zone_id = DynamicModelMultipleChoiceField(

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/forms/registrar.py

@@ -83,6 +83,13 @@ class RegistrarImportForm(NetBoxModelImportForm):
 class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
     model = Registrar
 
+    iana_id = forms.IntegerField(
+        required=False,
+        label="IANA ID",
+    )
+    address = forms.CharField(
+        required=False,
+    )
     referral_url = forms.CharField(
         required=False,
         label="Referral URL",
@@ -104,6 +111,7 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
         (
             None,
             (
+                "iana_id",
                 "address",
                 "referral_url",
                 "whois_server",
@@ -114,6 +122,7 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     nullable_fields = (
+        "iana_id",
         "address",
         "referral_url",
         "whois_server",

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/forms/zone.py

@@ -258,8 +258,8 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label="View",
     )
-    status = forms.ChoiceField(
-        choices=add_blank_choice(ZoneStatusChoices),
+    status = forms.MultipleChoiceField(
+        choices=ZoneStatusChoices,
         required=False,
     )
     name = forms.CharField(
@@ -595,8 +595,9 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         help_text="IPv4 network prefix with a mask length of at least 25 bits",
         validators=[validate_ipv4, validate_prefix, validate_rfc2317],
     )
-    rfc2317_parent_managed = forms.BooleanField(
+    rfc2317_parent_managed = forms.NullBooleanField(
         required=False,
+        widget=BulkEditNullBooleanSelect(),
         label="RFC2317 Parent Managed",
         help_text="IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS",
     )

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/management/commands/cleanup_rrset_ttl.py

@@ -34,7 +34,7 @@ class Command(BaseCommand):
         ttl_records = (
             Record.objects.filter(ttl__isnull=False)
             .exclude(type=RecordTypeChoices.SOA)
-            .exclude(type=RecordTypeChoices.PTR, maanged=True)
+            .exclude(type=RecordTypeChoices.PTR, managed=True)
         )
         for record in ttl_records:
             records = Record.objects.filter(

netbox_plugin_dns-0.22.9/netbox_dns/migrations/0029_record_fqdn.py

@@ -0,0 +1,30 @@
+from dns import name as dns_name
+
+from django.db import migrations, models
+
+
+def update_record_fqdn(apps, schema_editor):
+    Record = apps.get_model("netbox_dns", "Record")
+
+    for record in Record.objects.filter(fqdn__isnull=True):
+        zone = dns_name.from_text(record.zone.name, origin=dns_name.root)
+        fqdn = dns_name.from_text(record.name, origin=zone)
+
+        record.fqdn = fqdn.to_text()
+
+        record.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("netbox_dns", "0028_rfc2317_fields"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="record",
+            name="fqdn",
+            field=models.CharField(default=None, max_length=255, null=True, blank=True),
+        ),
+        migrations.RunPython(update_record_fqdn),
+    ]

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/models/nameserver.py

@@ -53,7 +53,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:
@@ -72,6 +72,8 @@ class NameServer(NetBoxModel):
                 }
             ) from None
 
+        super().clean(*args, **kwargs)
+
     def save(self, *args, **kwargs):
         self.full_clean()
 

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/models/record.py

@@ -114,17 +114,23 @@ class Record(NetBoxModel):
         Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
     )
 
+    name = models.CharField(
+        max_length=255,
+    )
     zone = models.ForeignKey(
         "Zone",
         on_delete=models.CASCADE,
     )
+    fqdn = models.CharField(
+        max_length=255,
+        null=True,
+        blank=True,
+        default=None,
+    )
     type = models.CharField(
         choices=RecordTypeChoices,
         max_length=10,
     )
-    name = models.CharField(
-        max_length=255,
-    )
     value = models.CharField(
         max_length=65535,
     )
@@ -209,14 +215,7 @@ class Record(NetBoxModel):
 
     def __str__(self):
         try:
-            name = (
-                dns_name.from_text(
-                    str(self.name),
-                    origin=dns_name.from_text(self.zone.name, origin=None),
-                )
-                .relativize(dns_name.root)
-                .to_unicode()
-            )
+            name = dns_name.from_text(self.fqdn).relativize(dns_name.root).to_unicode()
         except dns_name.IDNAException:
             name = self.name
         except dns_name.LabelTooLong as exc:
@@ -234,13 +233,6 @@ class Record(NetBoxModel):
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:record", kwargs={"pk": self.id})
 
-    @property
-    def fqdn(self):
-        zone = dns_name.from_text(self.zone.name)
-        name = dns_name.from_text(self.name, origin=zone)
-
-        return name.to_text()
-
     @property
     def value_fqdn(self):
         if self.type != RecordTypeChoices.CNAME:
@@ -393,6 +385,22 @@ class Record(NetBoxModel):
 
         self.ptr_record = ptr_record
 
+    def remove_from_rfc2317_cname_record(self, save_zone_serial=True):
+        if self.rfc2317_cname_record.pk:
+            rfc2317_ptr_records = self.rfc2317_cname_record.rfc2317_ptr_records.exclude(
+                pk=self.pk
+            )
+
+            if rfc2317_ptr_records:
+                self.rfc2317_cname_record.ttl = rfc2317_ptr_records.aggregate(
+                    Min("ttl")
+                ).get("ttl__min")
+                self.rfc2317_cname_record.save(
+                    update_fields=["ttl"], save_zone_serial=save_zone_serial
+                )
+            else:
+                self.rfc2317_cname_record.delete()
+
     def update_rfc2317_cname_record(self, save_zone_serial=True):
         if self.zone.rfc2317_parent_managed:
             cname_name = dns_name.from_text(
@@ -400,48 +408,56 @@ class Record(NetBoxModel):
             ).relativize(dns_name.from_text(self.zone.rfc2317_parent_zone.name))
 
             if self.rfc2317_cname_record is not None:
-                self.rfc2317_cname_record.name = cname_name
-                self.rfc2317_cname_record.zone = self.zone.rfc2317_parent_zone
-                self.rfc2317_cname_record.value = self.fqdn
-                self.rfc2317_cname_record.ttl = min_ttl(
-                    self.rfc2317_cname_record.rfc2317_ptr_records.exclude(pk=self.pk)
+                if self.rfc2317_cname_record.name == cname_name.to_text():
+                    self.rfc2317_cname_record.zone = self.zone.rfc2317_parent_zone
+                    self.rfc2317_cname_record.value = self.fqdn
+                    self.rfc2317_cname_record.ttl = min_ttl(
+                        self.rfc2317_cname_record.rfc2317_ptr_records.exclude(
+                            pk=self.pk
+                        )
+                        .aggregate(Min("ttl"))
+                        .get("ttl__min"),
+                        self.ttl,
+                    )
+                    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
+                    )
+
+            rfc2317_cname_record = Record.objects.filter(
+                name=cname_name,
+                type=RecordTypeChoices.CNAME,
+                zone=self.zone.rfc2317_parent_zone,
+                managed=True,
+                value=self.fqdn,
+            ).first()
+
+            if rfc2317_cname_record is not None:
+                rfc2317_cname_record.ttl = min_ttl(
+                    rfc2317_cname_record.rfc2317_ptr_records.exclude(pk=self.pk)
                     .aggregate(Min("ttl"))
                     .get("ttl__min"),
                     self.ttl,
                 )
-                self.rfc2317_cname_record.save(save_zone_serial=save_zone_serial)
+                rfc2317_cname_record.save(
+                    update_fields=["ttl"], save_zone_serial=save_zone_serial
+                )
+
             else:
-                rfc2317_cname_record = Record.objects.filter(
+                rfc2317_cname_record = Record(
                     name=cname_name,
                     type=RecordTypeChoices.CNAME,
                     zone=self.zone.rfc2317_parent_zone,
                     managed=True,
                     value=self.fqdn,
-                ).first()
-
-                if rfc2317_cname_record is not None:
-                    rfc2317_cname_record.ttl = min_ttl(
-                        rfc2317_cname_record.rfc2317_ptr_records.exclude(pk=self.pk)
-                        .aggregate(Min("ttl"))
-                        .get("ttl__min"),
-                        self.ttl,
-                    )
-                    rfc2317_cname_record.save(
-                        update_fields=["ttl"], save_zone_serial=save_zone_serial
-                    )
-
-                else:
-                    rfc2317_cname_record = Record(
-                        name=cname_name,
-                        type=RecordTypeChoices.CNAME,
-                        zone=self.zone.rfc2317_parent_zone,
-                        managed=True,
-                        value=self.fqdn,
-                        ttl=self.ttl,
-                    )
-                    rfc2317_cname_record.save(save_zone_serial=save_zone_serial)
+                    ttl=self.ttl,
+                )
+                rfc2317_cname_record.save(save_zone_serial=save_zone_serial)
 
-                self.rfc2317_cname_record = rfc2317_cname_record
+            self.rfc2317_cname_record = rfc2317_cname_record
 
         else:
             if self.rfc2317_cname_record is not None:
@@ -458,6 +474,7 @@ class Record(NetBoxModel):
             name.to_unicode()
 
             self.name = name.relativize(zone).to_text()
+            self.fqdn = fqdn.to_text()
 
         except dns.exception.DNSException as exc:
             raise ValidationError(
@@ -682,6 +699,8 @@ class Record(NetBoxModel):
                     }
                 ) from None
 
+        super().clean(*args, **kwargs)
+
     def save(
         self,
         *args,
@@ -725,20 +744,7 @@ class Record(NetBoxModel):
 
     def delete(self, *args, save_zone_serial=True, **kwargs):
         if self.rfc2317_cname_record:
-            if self.rfc2317_cname_record.pk:
-                if self.rfc2317_cname_record.rfc2317_ptr_records.count() == 1:
-                    self.rfc2317_cname_record.delete()
-                else:
-                    self.rfc2317_cname_record.ttl = (
-                        self.rfc2317_cname_record.rfc2317_ptr_records.exclude(
-                            pk=self.pk
-                        )
-                        .aggregate(Min("ttl"))
-                        .get("ttl__min")
-                    )
-                    self.rfc2317_cname_record.save(
-                        update_fields=["ttl"], save_zone_serial=save_zone_serial
-                    )
+            self.remove_from_rfc2317_cname_record(save_zone_serial=save_zone_serial)
 
         if self.ptr_record:
             self.ptr_record.delete()
@@ -754,7 +760,8 @@ class Record(NetBoxModel):
 class RecordIndex(SearchIndex):
     model = Record
     fields = (
-        ("name", 100),
+        ("fqdn", 100),
+        ("name", 120),
         ("value", 150),
         ("zone", 200),
         ("type", 200),

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/models/zone.py

@@ -738,6 +738,15 @@ 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:
+            for _record in self.record_set.all():
+                _record.save(
+                    update_fields=["fqdn"],
+                    save_zone_serial=False,
+                    update_rrset_ttl=False,
+                    update_rfc2317_cname=False,
+                )
+
         self.save_soa_serial()
         self.update_soa_record()
 

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/templates/netbox_dns/record.html

@@ -53,7 +53,7 @@
                         <td><a href="{% url 'plugins:netbox_dns:zone_records' pk=object.zone.pk %}">{{ object.zone }}</a></td>
                         {% endif %}
                     </tr>
-                    {% if not object.managed %}
+                    {% if object.tenant %}
                     <tr>
                         <th scope="row">Tenant</th>
                         <td>

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/views/record.py

@@ -41,22 +41,15 @@ class RecordView(generic.ObjectView):
     queryset = Record.objects.all().prefetch_related("zone", "ptr_record")
 
     def get_value_records(self, instance):
-        value_fqdn = dns_name.from_text(instance.value_fqdn)
-        value_zone_names = [
-            value_fqdn.split(length)[1].to_text().rstrip(".")
-            for length in range(2, len(value_fqdn))
-        ]
-
-        value_zone = (
-            Zone.objects.filter(instance.zone.view_filter, name__in=value_zone_names)
-            .order_by(Length("name").desc())
-            .first()
+        view_filter = (
+            Q(zone__view__isnull=True)
+            if instance.zone.view is None
+            else Q(zone__view=instance.zone.view)
         )
-        if not value_zone:
-            return None
 
-        value_name = value_fqdn.relativize(dns_name.from_text(value_zone.name))
-        cname_targets = Record.objects.filter(zone=value_zone, name=value_name)
+        value_fqdn = dns_name.from_text(instance.value_fqdn)
+
+        cname_targets = Record.objects.filter(view_filter, fqdn=value_fqdn)
 
         if cname_targets:
             return RelatedRecordTable(
@@ -80,7 +73,7 @@ class RecordView(generic.ObjectView):
         fqdn = dns_name.from_text(instance.fqdn)
         parent_zone_names = [
             fqdn.split(length)[1].to_text().rstrip(".")
-            for length in range(1, len(fqdn))
+            for length in range(1, len(fqdn) + 1)
         ]
 
         parent_zones = Zone.objects.filter(

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "0.22.6"
+version = "0.22.9"
 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"

{netbox_plugin_dns-0.22.6 → netbox_plugin_dns-0.22.9}/netbox_dns/tables/record.py

@@ -61,8 +61,8 @@ class RecordTable(RecordBaseTable):
         model = Record
         fields = (
             "pk",
-            "zone",
             "name",
+            "zone",
             "ttl",
             "type",
             "value",
@@ -77,8 +77,8 @@ class RecordTable(RecordBaseTable):
             "tenant_group",
         )
         default_columns = (
-            "zone",
             "name",
+            "zone",
             "ttl",
             "type",
             "value",
@@ -101,8 +101,8 @@ class ManagedRecordTable(RecordBaseTable):
     class Meta(NetBoxTable.Meta):
         model = Record
         fields = (
-            "zone",
             "name",
+            "zone",
             "ttl",
             "type",
             "value",
@@ -112,8 +112,8 @@ class ManagedRecordTable(RecordBaseTable):
             "active",
         )
         default_columns = (
-            "zone",
             "name",
+            "zone",
             "ttl",
             "type",
             "value",