netbox-plugin-dns 1.1.0b6__py3-none-any.whl → 1.1.1__py3-none-any.whl

netbox_dns/urls/zone.py

@@ -1,63 +1,25 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Zone
 from netbox_dns.views import (
-    ZoneListView,
     ZoneView,
-    ZoneDeleteView,
+    ZoneListView,
     ZoneEditView,
+    ZoneDeleteView,
     ZoneBulkImportView,
     ZoneBulkEditView,
     ZoneBulkDeleteView,
-    ZoneRecordListView,
-    ZoneManagedRecordListView,
-    ZoneRegistrationView,
-    ZoneRFC2317ChildZoneListView,
-    ZoneChildZoneListView,
 )
 
 zone_urlpatterns = [
+    path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
     path("zones/", ZoneListView.as_view(), name="zone_list"),
     path("zones/add/", ZoneEditView.as_view(), name="zone_add"),
+    path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
+    path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
     path("zones/import/", ZoneBulkImportView.as_view(), name="zone_import"),
     path("zones/edit/", ZoneBulkEditView.as_view(), name="zone_bulk_edit"),
     path("zones/delete/", ZoneBulkDeleteView.as_view(), name="zone_bulk_delete"),
-    path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
-    path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
-    path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
-    path("zones/<int:pk>/records/", ZoneRecordListView.as_view(), name="zone_records"),
-    path(
-        "zones/<int:pk>/managedrecords/",
-        ZoneManagedRecordListView.as_view(),
-        name="zone_managed_records",
-    ),
-    path(
-        "zones/<int:pk>/rfc2317childzones/",
-        ZoneRFC2317ChildZoneListView.as_view(),
-        name="zone_rfc2317_child_zones",
-    ),
-    path(
-        "zones/<int:pk>/childzones/",
-        ZoneChildZoneListView.as_view(),
-        name="zone_child_zones",
-    ),
-    path(
-        "zones/<int:pk>/registration/",
-        ZoneRegistrationView.as_view(),
-        name="zone_registration",
-    ),
-    path(
-        "zones/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="zone_journal",
-        kwargs={"model": Zone},
-    ),
-    path(
-        "zones/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="zone_changelog",
-        kwargs={"model": Zone},
-    ),
+    path("zones/<int:pk>/", include(get_model_urls("netbox_dns", "zone"))),
 ]

netbox_dns/urls/zone_template.py

@@ -1,21 +1,31 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import ZoneTemplate
 from netbox_dns.views import (
-    ZoneTemplateListView,
     ZoneTemplateView,
-    ZoneTemplateDeleteView,
+    ZoneTemplateListView,
     ZoneTemplateEditView,
+    ZoneTemplateDeleteView,
     ZoneTemplateBulkImportView,
     ZoneTemplateBulkEditView,
     ZoneTemplateBulkDeleteView,
 )
 
 zonetemplate_urlpatterns = [
+    path("zonetemplates/<int:pk>/", ZoneTemplateView.as_view(), name="zonetemplate"),
     path("zonetemplates/", ZoneTemplateListView.as_view(), name="zonetemplate_list"),
     path("zonetemplates/add/", ZoneTemplateEditView.as_view(), name="zonetemplate_add"),
+    path(
+        "zonetemplates/<int:pk>/edit/",
+        ZoneTemplateEditView.as_view(),
+        name="zonetemplate_edit",
+    ),
+    path(
+        "zonetemplates/<int:pk>/delete/",
+        ZoneTemplateDeleteView.as_view(),
+        name="zonetemplate_delete",
+    ),
     path(
         "zonetemplates/import/",
         ZoneTemplateBulkImportView.as_view(),
@@ -31,27 +41,7 @@ zonetemplate_urlpatterns = [
         ZoneTemplateBulkDeleteView.as_view(),
         name="zonetemplate_bulk_delete",
     ),
-    path("zonetemplates/<int:pk>/", ZoneTemplateView.as_view(), name="zonetemplate"),
-    path(
-        "zonetemplates/<int:pk>/delete/",
-        ZoneTemplateDeleteView.as_view(),
-        name="zonetemplate_delete",
-    ),
-    path(
-        "zonetemplates/<int:pk>/edit/",
-        ZoneTemplateEditView.as_view(),
-        name="zonetemplate_edit",
-    ),
-    path(
-        "zonetemplates/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="zonetemplate_journal",
-        kwargs={"model": ZoneTemplate},
-    ),
     path(
-        "zonetemplates/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="zonetemplate_changelog",
-        kwargs={"model": ZoneTemplate},
+        "zonetemplates/<int:pk>/", include(get_model_urls("netbox_dns", "zonetemplate"))
     ),
 ]

netbox_dns/utilities/ipam_dnssync.py

@@ -59,6 +59,20 @@ def _valid_entry(ip_address, zone):
     ).is_subdomain(dns_name.from_text(zone.name))
 
 
+def _match_data(ip_address, record):
+    cf_disable_ptr = ip_address.custom_field_data.get(
+        "ipaddress_dns_record_disable_ptr"
+    )
+
+    return (
+        record.fqdn.rstrip(".") == ip_address.dns_name.rstrip(".")
+        and record.value == str(ip_address.address.ip)
+        and record.status == _get_record_status(ip_address)
+        and record.ttl == ip_address.custom_field_data.get("ipaddress_dns_record_ttl")
+        and (cf_disable_ptr is None or record.disable_ptr == cf_disable_ptr)
+    )
+
+
 def get_zones(ip_address, view=None, old_zone=None):
     if view is None:
         views = _get_assigned_views(ip_address)
@@ -74,7 +88,7 @@ def get_zones(ip_address, view=None, old_zone=None):
     fqdn = dns_name.from_text(ip_address.dns_name)
     zone_name_candidates = [
         fqdn.split(i)[1].to_text().rstrip(".")
-        for i in range(min_labels + 1, len(fqdn.labels))
+        for i in range(min_labels + 1, len(fqdn.labels) + 1)
     ]
 
     zones = _zone.Zone.objects.filter(
@@ -108,11 +122,7 @@ def check_dns_records(ip_address, zone=None, view=None):
 
         if ip_address.pk is not None:
             for record in ip_address.netbox_dns_records.filter(zone__in=zones):
-                if (
-                    record.fqdn != ip_address.dns_name
-                    or record.value != ip_address.address.ip
-                    or record.status != _get_record_status(ip_address)
-                ):
+                if not _match_data(ip_address, record):
                     record.update_from_ip_address(ip_address)
 
                     if record is not None:
@@ -121,9 +131,7 @@ def check_dns_records(ip_address, zone=None, view=None):
             zones = _zone.Zone.objects.filter(
                 pk__in=[zone.pk for zone in zones]
             ).exclude(
-                pk__in=set(
-                    ip_address.netbox_dns_records.all().values_list("zone", flat=True)
-                )
+                pk__in=set(ip_address.netbox_dns_records.values_list("zone", flat=True))
             )
 
         for zone in zones:
@@ -159,22 +167,14 @@ def update_dns_records(ip_address):
 
     if ip_address.pk is not None:
         for record in ip_address.netbox_dns_records.all():
-            if record.zone not in zones:
+            if record.zone not in zones or ip_address.custom_field_data.get(
+                "ipaddress_dns_disabled"
+            ):
                 record.delete()
                 continue
 
-            cf_disable_ptr = ip_address.custom_field_data.get(
-                "ipaddress_dns_record_disable_ptr"
-            )
-
-            if (
-                record.fqdn.rstrip(".") != ip_address.dns_name.rstrip(".")
-                or record.value != str(ip_address.address.ip)
-                or record.status != _get_record_status(ip_address)
-                or record.ttl
-                != ip_address.custom_field_data.get("ipaddress_dns_record_ttl")
-                or (cf_disable_ptr is not None and record.disable_ptr != cf_disable_ptr)
-            ):
+            record.update_fqdn()
+            if not _match_data(ip_address, record):
                 record.update_from_ip_address(ip_address)
 
                 if record is not None:
@@ -271,9 +271,11 @@ def get_ip_addresses_by_zone(zone):
     are the IPAddress objects in prefixes assigned to the same view, if the
     'dns_name' attribute of the IPAddress object ends in the zone's name.
     """
-    queryset = get_ip_addresses_by_view(zone.view)
+    queryset = get_ip_addresses_by_view(zone.view).filter(
+        dns_name__regex=rf"\.{re.escape(zone.name)}\.?$"
+    )
 
-    return queryset.filter(dns_name__regex=rf"\.{re.escape(zone.name)}\.?$")
+    return queryset
 
 
 def check_record_permission(add=True, change=True, delete=True):

netbox_dns/validators/dns_name.py

@@ -7,6 +7,7 @@ from netbox.plugins.utils import get_plugin_config
 
 __all__ = (
     "validate_fqdn",
+    "validate_rname",
     "validate_generic_name",
     "validate_domain_name",
 )
@@ -57,6 +58,14 @@ def validate_fqdn(name, always_tolerant=False):
         raise ValidationError(f"{name} is not a valid fully qualified DNS host name")
 
 
+def validate_rname(name, always_tolerant=False):
+    label, zone_label = _get_label(always_tolerant=always_tolerant)
+    regex = rf"^(\*|{label})(\\\.{label})*(\.{zone_label}){{2,}}\.?$"
+
+    if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
+        raise ValidationError(f"{name} is not a valid RNAME")
+
+
 def validate_generic_name(
     name, tolerate_leading_underscores=False, always_tolerant=False
 ):

netbox_dns/views/__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/views/nameserver.py

@@ -2,6 +2,7 @@ from dns import name as dns_name
 
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
+from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import NameServerFilterSet, ZoneFilterSet
 from netbox_dns.forms import (
@@ -15,15 +16,13 @@ from netbox_dns.tables import NameServerTable, ZoneTable
 
 
 __all__ = (
-    "NameServerListView",
     "NameServerView",
+    "NameServerListView",
     "NameServerEditView",
     "NameServerDeleteView",
     "NameServerBulkEditView",
     "NameServerBulkImportView",
     "NameServerBulkDeleteView",
-    "NameServerZoneListView",
-    "NameServerSOAZoneListView",
 )
 
 
@@ -77,6 +76,11 @@ class NameServerBulkDeleteView(generic.BulkDeleteView):
     table = NameServerTable
 
 
+@register_model_view(NameServer, "contacts")
+class NameServerContactsView(ObjectContactsView):
+    queryset = NameServer.objects.all()
+
+
 @register_model_view(NameServer, "zones")
 class NameServerZoneListView(generic.ObjectChildrenView):
     queryset = NameServer.objects.all().prefetch_related("zones")

netbox_dns/views/record.py

@@ -1,10 +1,8 @@
 from dns import name as dns_name
 
-from django.db.models import F, Q, Case, When, OuterRef, Subquery
-
 from netbox.views import generic
-from ipam.fields import IPAddressField
-from ipam.models import IPAddress
+from utilities.views import register_model_view
+from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import RecordFilterSet
 from netbox_dns.forms import (
@@ -20,14 +18,14 @@ from netbox_dns.utilities import value_to_unicode
 
 
 __all__ = (
-    "RecordListView",
-    "ManagedRecordListView",
     "RecordView",
+    "RecordListView",
     "RecordEditView",
     "RecordDeleteView",
     "RecordBulkImportView",
     "RecordBulkEditView",
     "RecordBulkDeleteView",
+    "ManagedRecordListView",
 )
 
 
@@ -41,7 +39,9 @@ class RecordListView(generic.ObjectListView):
 
 
 class ManagedRecordListView(generic.ObjectListView):
-    queryset = Record.objects.prefetch_related("ipam_ip_address", "address_record")
+    queryset = Record.objects.filter(managed=True).prefetch_related(
+        "ipam_ip_address", "address_record"
+    )
     filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = ManagedRecordTable
@@ -157,3 +157,8 @@ class RecordBulkEditView(generic.BulkEditView):
 class RecordBulkDeleteView(generic.BulkDeleteView):
     queryset = Record.objects.filter(managed=False)
     table = RecordTable
+
+
+@register_model_view(Record, "contacts")
+class RecordContactsView(ObjectContactsView):
+    queryset = Record.objects.all()

netbox_dns/views/record_template.py

@@ -15,8 +15,8 @@ from netbox_dns.utilities import value_to_unicode
 
 
 __all__ = (
-    "RecordTemplateListView",
     "RecordTemplateView",
+    "RecordTemplateListView",
     "RecordTemplateEditView",
     "RecordTemplateDeleteView",
     "RecordTemplateBulkImportView",

netbox_dns/views/registrar.py

@@ -21,7 +21,6 @@ __all__ = (
     "RegistrarBulkImportView",
     "RegistrarBulkEditView",
     "RegistrarBulkDeleteView",
-    "RegistrarZoneListView",
 )
 
 

netbox_dns/views/registration_contact.py

@@ -0,0 +1,94 @@
+from django.db.models import Q
+
+from netbox.views import generic
+
+from utilities.views import ViewTab, register_model_view
+
+from netbox_dns.models import RegistrationContact, Zone
+from netbox_dns.filtersets import RegistrationContactFilterSet, ZoneFilterSet
+from netbox_dns.forms import (
+    RegistrationContactForm,
+    RegistrationContactFilterForm,
+    RegistrationContactImportForm,
+    RegistrationContactBulkEditForm,
+)
+from netbox_dns.tables import RegistrationContactTable, ZoneTable
+
+
+__all__ = (
+    "RegistrationContactView",
+    "RegistrationContactEditView",
+    "RegistrationContactListView",
+    "RegistrationContactDeleteView",
+    "RegistrationContactBulkImportView",
+    "RegistrationContactBulkEditView",
+    "RegistrationContactBulkDeleteView",
+)
+
+
+class RegistrationContactView(generic.ObjectView):
+    queryset = RegistrationContact.objects.all()
+
+
+class RegistrationContactListView(generic.ObjectListView):
+    queryset = RegistrationContact.objects.all()
+    table = RegistrationContactTable
+    filterset = RegistrationContactFilterSet
+    filterset_form = RegistrationContactFilterForm
+
+
+class RegistrationContactEditView(generic.ObjectEditView):
+    queryset = RegistrationContact.objects.all()
+    form = RegistrationContactForm
+    default_return_url = "plugins:netbox_dns:registrationcontact_list"
+
+
+class RegistrationContactDeleteView(generic.ObjectDeleteView):
+    queryset = RegistrationContact.objects.all()
+    default_return_url = "plugins:netbox_dns:registrationcontact_list"
+
+
+class RegistrationContactBulkImportView(generic.BulkImportView):
+    queryset = RegistrationContact.objects.all()
+    model_form = RegistrationContactImportForm
+    table = RegistrationContactTable
+    default_return_url = "plugins:netbox_dns:registrationcontact_list"
+
+
+class RegistrationContactBulkEditView(generic.BulkEditView):
+    queryset = RegistrationContact.objects.all()
+    filterset = RegistrationContactFilterSet
+    table = RegistrationContactTable
+    form = RegistrationContactBulkEditForm
+
+
+class RegistrationContactBulkDeleteView(generic.BulkDeleteView):
+    queryset = RegistrationContact.objects.all()
+    table = RegistrationContactTable
+
+
+@register_model_view(RegistrationContact, "zones")
+class RegistrationContactZoneListView(generic.ObjectChildrenView):
+    queryset = RegistrationContact.objects.all().prefetch_related(
+        "zone_set", "admin_c_zones", "tech_c_zones", "billing_c_zones"
+    )
+    child_model = Zone
+    table = ZoneTable
+    filterset = ZoneFilterSet
+    template_name = "netbox_dns/zone/child.html"
+    hide_if_empty = True
+
+    tab = ViewTab(
+        label="Zones",
+        permission="netbox_dns.view_zone",
+        badge=lambda obj: len(obj.zones),
+        hide_if_empty=True,
+    )
+
+    def get_children(self, request, parent):
+        return Zone.objects.filter(
+            Q(registrant=parent)
+            | Q(admin_c=parent)
+            | Q(tech_c=parent)
+            | Q(billing_c=parent)
+        )

netbox_dns/views/view.py

@@ -1,6 +1,7 @@
 from utilities.views import ViewTab, register_model_view
 
 from netbox.views import generic
+from tenancy.views import ObjectContactsView
 from ipam.models import Prefix
 
 from netbox_dns.models import View, Zone
@@ -24,7 +25,6 @@ __all__ = (
     "ViewBulkImportView",
     "ViewBulkEditView",
     "ViewBulkDeleteView",
-    "ViewZoneListView",
     "ViewPrefixEditView",
 )
 
@@ -104,3 +104,8 @@ class ViewZoneListView(generic.ObjectChildrenView):
 
     def get_children(self, request, parent):
         return parent.zone_set
+
+
+@register_model_view(View, "contacts")
+class ViewContactsView(ObjectContactsView):
+    queryset = View.objects.all()

netbox_dns/views/zone.py

@@ -2,6 +2,7 @@ from dns import name as dns_name
 
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
+from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import ZoneFilterSet, RecordFilterSet
 from netbox_dns.forms import (
@@ -19,18 +20,13 @@ from netbox_dns.tables import (
 
 
 __all__ = (
-    "ZoneListView",
     "ZoneView",
+    "ZoneListView",
     "ZoneEditView",
     "ZoneDeleteView",
     "ZoneBulkImportView",
     "ZoneBulkEditView",
     "ZoneBulkDeleteView",
-    "ZoneRegistrationView",
-    "ZoneRecordListView",
-    "ZoneManagedRecordListView",
-    "ZoneRFC2317ChildZoneListView",
-    "ZoneChildZoneListView",
 )
 
 
@@ -201,3 +197,8 @@ class ZoneChildZoneListView(generic.ObjectChildrenView):
 
     def get_children(self, request, parent):
         return parent.child_zones
+
+
+@register_model_view(Zone, "contacts")
+class ZoneContactsView(ObjectContactsView):
+    queryset = Zone.objects.all()

netbox_dns/views/zone_template.py

@@ -1,5 +1,6 @@
 from netbox.views import generic
 
+from netbox_dns.models import ZoneTemplate
 from netbox_dns.filtersets import ZoneTemplateFilterSet
 from netbox_dns.forms import (
     ZoneTemplateImportForm,
@@ -7,13 +8,12 @@ from netbox_dns.forms import (
     ZoneTemplateFilterForm,
     ZoneTemplateBulkEditForm,
 )
-from netbox_dns.models import ZoneTemplate
 from netbox_dns.tables import ZoneTemplateTable, RecordTemplateDisplayTable
 
 
 __all__ = (
-    "ZoneTemplateListView",
     "ZoneTemplateView",
+    "ZoneTemplateListView",
     "ZoneTemplateEditView",
     "ZoneTemplateDeleteView",
     "ZoneTemplateBulkImportView",

{netbox_plugin_dns-1.1.0b6.dist-info → netbox_plugin_dns-1.1.1.dist-info}/METADATA

@@ -1,22 +1,18 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b6
+Version: 1.1.1
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
-Home-page: https://github.com/peteeckel/netbox-plugin-dns
-License: MIT
+Author-email: Peter Eckel <pete@netbox-dns.org>
+Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
+Project-URL: Documentation, https://github.com/peteeckel/netbox-plugin-dns/blob/main/docs/using_netbox_dns.md
+Project-URL: Repository, https://github.com/peteeckel/netbox-plugin-dns
+Project-URL: Issues, https://github.com/peteeckel/netbox-plugin-dns/issues
 Keywords: netbox,netbox-plugin,dns
-Author: Peter Eckel
-Author-email: pete@netbox-dns.org
-Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: dnspython (>=2.6.1,<3.0.0)
-Project-URL: Repository, https://github.com/peteeckel/netbox-plugin-dns
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dnspython
 
 # NetBox DNS
 The NetBox DNS plugin enables NetBox to manage operational DNS data such as name servers, zones, records and views, as well as registration data for domains. It can automate tasks like creating PTR records, generating zone serial numbers, NS and SOA records, as well as validate names and values values for resource records to ensure zone data is consistent, up-to-date and compliant with to the relevant RFCs.
@@ -34,6 +30,11 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>
 </div>
 
+> [!WARNING]
+> **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
+> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This warning will be updated as soon as the situation is resolved.
+
 ## Objectives
 NetBox DNS is designed to be the 'DNS Source of Truth' analogous to NetBox being the 'Network Source of Truth'.
 
@@ -111,4 +112,3 @@ For further information, please refer to the full documentation: [Using NetBox D
 ## License
 
 MIT
-