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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.22.5
+Version: 0.22.6
 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_dns/__init__.py

@@ -0,0 +1,50 @@
+import sys
+
+from extras.plugins import PluginConfig
+from django.db.utils import OperationalError
+
+try:
+    # NetBox 3.5.0 - 3.5.7, 3.5.9+
+    from extras.plugins import get_plugin_config
+except ImportError:
+    # NetBox 3.5.8
+    from extras.plugins.utils import get_plugin_config
+
+__version__ = "0.22.6"
+
+
+class DNSConfig(PluginConfig):
+    name = "netbox_dns"
+    verbose_name = "NetBox DNS"
+    description = "NetBox plugin for DNS data"
+    min_version = "3.5.0"
+    version = __version__
+    author = "Peter Eckel"
+    author_email = "pete@netbox-dns.org"
+    required_settings = []
+    default_settings = {
+        "zone_default_ttl": 86400,
+        "zone_soa_serial_auto": True,
+        "zone_soa_serial": 1,
+        "zone_soa_refresh": 43200,
+        "zone_soa_retry": 7200,
+        "zone_soa_expire": 2419200,
+        "zone_soa_minimum": 3600,
+        "feature_ipam_coupling": False,
+        "tolerate_underscores_in_hostnames": False,
+        "tolerate_leading_underscore_types": [
+            "TXT",
+            "SRV",
+        ],
+        "tolerate_non_rfc1035_types": [],
+        "enable_root_zones": False,
+        "enforce_unique_records": True,
+        "enforce_unique_rrset_ttl": True,
+    }
+    base_url = "netbox-dns"
+
+
+#
+# Initialize plugin config
+#
+config = DNSConfig

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

@@ -241,6 +241,16 @@ class Record(NetBoxModel):
 
         return name.to_text()
 
+    @property
+    def value_fqdn(self):
+        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)
+
+        return value_fqdn.to_text()
+
     @property
     def address_from_name(self):
         prefix = arpa_to_prefix(self.fqdn)

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

@@ -112,12 +112,6 @@
                         <td><a href="{% url 'ipam:ipaddress' pk=object.ipam_ip_address.pk %}">{{ object.ipam_ip_address }}</td>
                     </tr>
                     {% endif %}
-                    {% if object.rfc2317_cname_record %}
-                    <tr>
-                        <th scope="row">RFC2317 CNAME Record</th>
-                        <td><a href="{% url 'plugins:netbox_dns:record' pk=object.rfc2317_cname_record.pk %}">{{ object.rfc2317_cname_record }}</td>
-                    </tr>
-                    {% endif %}
                     <tr>
                         <th scope="row">Status</th>
                         <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
@@ -131,23 +125,13 @@
                 </table>
             </div>
         </div>
-        {% if object.rfc2317_ptr_records.all|length %}
+        {% if cname_target_table and cname_target_table.rows|length > 0 %}
         <div class="card">
-            <h5 class="card-header">RFC2317 Targets</h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th>Address Record</th>
-                        <th>PTR Record</th>
-                    </tr>
-                    {% for record in object.rfc2317_ptr_records.all %}
-                    <tr>
-                        <td><a href="{% url 'plugins:netbox_dns:record' pk=record.address_record.pk %}">{{ record.address_record }}</td>
-                        <td><a href="{% url 'plugins:netbox_dns:record' pk=record.pk %}">{{ record }}</td>
-                    </td>
-                    {% endfor %}
-                </table>
-            </div>
+            {% include 'inc/panel_table.html' with table=cname_target_table heading='CNAME Targets' %}
+        </div>
+        {% elif cname_table and cname_table.rows|length > 0 %}
+        <div class="card">
+            {% include 'inc/panel_table.html' with table=cname_table heading='CNAMEs' %}
         </div>
         {% endif %}
         {% if not object.managed %}

netbox_plugin_dns-0.22.6/netbox_dns/views/record.py

@@ -0,0 +1,159 @@
+from dns import name as dns_name
+
+from django.db.models import Q
+from django.db.models.functions import Length
+
+from netbox.views import generic
+
+from netbox_dns.filters import RecordFilter
+from netbox_dns.forms import (
+    RecordImportForm,
+    RecordFilterForm,
+    RecordForm,
+    RecordBulkEditForm,
+)
+from netbox_dns.models import Record, RecordTypeChoices, Zone
+from netbox_dns.tables import RecordTable, ManagedRecordTable, RelatedRecordTable
+from netbox_dns.utilities import value_to_unicode
+
+
+class RecordListView(generic.ObjectListView):
+    queryset = Record.objects.filter(managed=False).prefetch_related(
+        "zone", "ptr_record"
+    )
+    filterset = RecordFilter
+    filterset_form = RecordFilterForm
+    table = RecordTable
+
+
+class ManagedRecordListView(generic.ObjectListView):
+    queryset = Record.objects.filter(managed=True).prefetch_related(
+        "zone", "address_record"
+    )
+    filterset = RecordFilter
+    filterset_form = RecordFilterForm
+    table = ManagedRecordTable
+    actions = ("export",)
+    template_name = "netbox_dns/record/managed.html"
+
+
+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()
+        )
+        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)
+
+        if cname_targets:
+            return RelatedRecordTable(
+                data=cname_targets,
+            )
+
+        return None
+
+    def get_cname_records(self, instance):
+        view_filter = (
+            Q(zone__view__isnull=True)
+            if instance.zone.view is None
+            else Q(zone__view=instance.zone.view)
+        )
+        cname_records = set(
+            Record.objects.filter(
+                view_filter, value=instance.fqdn, type=RecordTypeChoices.CNAME
+            )
+        )
+
+        fqdn = dns_name.from_text(instance.fqdn)
+        parent_zone_names = [
+            fqdn.split(length)[1].to_text().rstrip(".")
+            for length in range(1, len(fqdn))
+        ]
+
+        parent_zones = Zone.objects.filter(
+            instance.zone.view_filter, name__in=parent_zone_names
+        )
+
+        for parent_zone in parent_zones:
+            parent_cname_records = Record.objects.filter(
+                view_filter, type=RecordTypeChoices.CNAME, zone=parent_zone
+            )
+            cname_records = cname_records.union(
+                set(
+                    record
+                    for record in parent_cname_records
+                    if record.value_fqdn == instance.fqdn
+                )
+            )
+
+        if cname_records:
+            return RelatedRecordTable(
+                data=cname_records,
+            )
+
+        return None
+
+    def get_extra_context(self, request, instance):
+        context = {}
+
+        name = dns_name.from_text(instance.name, origin=None)
+        if name.to_text() != name.to_unicode():
+            context["unicode_name"] = name.to_unicode()
+
+        unicode_value = value_to_unicode(instance.value)
+        if instance.value != unicode_value:
+            context["unicode_value"] = unicode_value
+
+        if instance.type == RecordTypeChoices.CNAME:
+            context["cname_target_table"] = self.get_value_records(instance)
+        else:
+            context["cname_table"] = self.get_cname_records(instance)
+
+        return context
+
+
+class RecordEditView(generic.ObjectEditView):
+    queryset = Record.objects.filter(managed=False).prefetch_related(
+        "zone", "ptr_record"
+    )
+    form = RecordForm
+    default_return_url = "plugins:netbox_dns:record_list"
+
+
+class RecordDeleteView(generic.ObjectDeleteView):
+    queryset = Record.objects.filter(managed=False)
+    default_return_url = "plugins:netbox_dns:record_list"
+
+
+class RecordBulkImportView(generic.BulkImportView):
+    queryset = Record.objects.filter(managed=False).prefetch_related(
+        "zone", "ptr_record"
+    )
+    model_form = RecordImportForm
+    table = RecordTable
+    default_return_url = "plugins:netbox_dns:record_list"
+
+
+class RecordBulkEditView(generic.BulkEditView):
+    queryset = Record.objects.filter(managed=False).prefetch_related("zone")
+    filterset = RecordFilter
+    table = RecordTable
+    form = RecordBulkEditForm
+
+
+class RecordBulkDeleteView(generic.BulkDeleteView):
+    queryset = Record.objects.filter(managed=False)
+    table = RecordTable

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "0.22.5"
+version = "0.22.6"
 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.5/netbox_dns/__init__.py

@@ -1,87 +0,0 @@
-import sys
-
-from extras.plugins import PluginConfig
-from django.db.utils import OperationalError
-
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
-
-__version__ = "0.22.5"
-
-
-class DNSConfig(PluginConfig):
-    name = "netbox_dns"
-    verbose_name = "NetBox DNS"
-    description = "NetBox plugin for DNS data"
-    min_version = "3.5.0"
-    version = __version__
-    author = "Peter Eckel"
-    author_email = "pete@netbox-dns.org"
-    required_settings = []
-    default_settings = {
-        "zone_default_ttl": 86400,
-        "zone_soa_serial_auto": True,
-        "zone_soa_serial": 1,
-        "zone_soa_refresh": 43200,
-        "zone_soa_retry": 7200,
-        "zone_soa_expire": 2419200,
-        "zone_soa_minimum": 3600,
-        "feature_ipam_coupling": False,
-        "tolerate_underscores_in_hostnames": False,
-        "tolerate_leading_underscore_types": [
-            "TXT",
-            "SRV",
-        ],
-        "tolerate_non_rfc1035_types": [],
-        "enable_root_zones": False,
-        "enforce_unique_records": True,
-        "enforce_unique_rrset_ttl": True,
-    }
-    base_url = "netbox-dns"
-
-    def ready(self):
-        #
-        # Check if required custom fields exist for IPAM coupling
-        #
-        if get_plugin_config("netbox_dns", "feature_ipam_coupling"):
-            from extras.models import CustomField
-            from ipam.models import IPAddress
-            from django.contrib.contenttypes.models import ContentType
-
-            try:
-                objtype = ContentType.objects.get_for_model(IPAddress)
-                required_cf = (
-                    "ipaddress_dns_record_name",
-                    "ipaddress_dns_record_ttl",
-                    "ipaddress_dns_record_disable_ptr",
-                    "ipaddress_dns_zone_id",
-                )
-
-                if CustomField.objects.filter(
-                    name__in=required_cf, content_types=objtype
-                ).count() < len(required_cf):
-                    print(
-                        "WARNING: 'feature_ipam_coupling' is enabled, but the required"
-                        " custom fields for IPAM DNS coupling are missing. Please run"
-                        " the Django management command 'setup_coupling' to create the"
-                        " missing custom fields.",
-                        file=sys.stderr,
-                    )
-            except OperationalError as exc:
-                print(
-                    "WARNING: Unable to connect to PostgreSQL, cannot check custom fields"
-                    " for feature_ipam_coupling",
-                    file=sys.stderr,
-                )
-
-        super().ready()
-
-
-#
-# Initialize plugin config
-#
-config = DNSConfig

netbox_plugin_dns-0.22.5/netbox_dns/views/record.py

@@ -1,85 +0,0 @@
-from dns import name as dns_name
-
-from netbox.views import generic
-
-from netbox_dns.filters import RecordFilter
-from netbox_dns.forms import (
-    RecordImportForm,
-    RecordFilterForm,
-    RecordForm,
-    RecordBulkEditForm,
-)
-from netbox_dns.models import Record
-from netbox_dns.tables import RecordTable, ManagedRecordTable
-from netbox_dns.utilities import value_to_unicode
-
-
-class RecordListView(generic.ObjectListView):
-    queryset = Record.objects.filter(managed=False).prefetch_related(
-        "zone", "ptr_record"
-    )
-    filterset = RecordFilter
-    filterset_form = RecordFilterForm
-    table = RecordTable
-
-
-class ManagedRecordListView(generic.ObjectListView):
-    queryset = Record.objects.filter(managed=True).prefetch_related(
-        "zone", "address_record"
-    )
-    filterset = RecordFilter
-    filterset_form = RecordFilterForm
-    table = ManagedRecordTable
-    actions = ("export",)
-    template_name = "netbox_dns/record/managed.html"
-
-
-class RecordView(generic.ObjectView):
-    queryset = Record.objects.all().prefetch_related("zone", "ptr_record")
-
-    def get_extra_context(self, request, instance):
-        context = {}
-
-        name = dns_name.from_text(instance.name, origin=None)
-        if name.to_text() != name.to_unicode():
-            context["unicode_name"] = name.to_unicode()
-
-        unicode_value = value_to_unicode(instance.value)
-        if instance.value != unicode_value:
-            context["unicode_value"] = unicode_value
-
-        return context
-
-
-class RecordEditView(generic.ObjectEditView):
-    queryset = Record.objects.filter(managed=False).prefetch_related(
-        "zone", "ptr_record"
-    )
-    form = RecordForm
-    default_return_url = "plugins:netbox_dns:record_list"
-
-
-class RecordDeleteView(generic.ObjectDeleteView):
-    queryset = Record.objects.filter(managed=False)
-    default_return_url = "plugins:netbox_dns:record_list"
-
-
-class RecordBulkImportView(generic.BulkImportView):
-    queryset = Record.objects.filter(managed=False).prefetch_related(
-        "zone", "ptr_record"
-    )
-    model_form = RecordImportForm
-    table = RecordTable
-    default_return_url = "plugins:netbox_dns:record_list"
-
-
-class RecordBulkEditView(generic.BulkEditView):
-    queryset = Record.objects.filter(managed=False).prefetch_related("zone")
-    filterset = RecordFilter
-    table = RecordTable
-    form = RecordBulkEditForm
-
-
-class RecordBulkDeleteView(generic.BulkDeleteView):
-    queryset = Record.objects.filter(managed=False)
-    table = RecordTable