netbox-plugin-dns 1.1.0__py3-none-any.whl → 1.1.0b2__py3-none-any.whl

netbox_dns/urls/zone_template.py

@@ -1,31 +1,21 @@
-from django.urls import include, path
+from django.urls import path
 
-from utilities.urls import get_model_urls
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
+from netbox_dns.models import ZoneTemplate
 from netbox_dns.views import (
-    ZoneTemplateView,
     ZoneTemplateListView,
-    ZoneTemplateEditView,
+    ZoneTemplateView,
     ZoneTemplateDeleteView,
+    ZoneTemplateEditView,
     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(),
@@ -41,7 +31,27 @@ 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>/", include(get_model_urls("netbox_dns", "zonetemplate"))
+        "zonetemplates/<int:pk>/changelog/",
+        ObjectChangeLogView.as_view(),
+        name="zonetemplate_changelog",
+        kwargs={"model": ZoneTemplate},
     ),
 ]

netbox_dns/utilities/__init__.py

@@ -1,2 +1,2 @@
 from .conversions import *
-from .ipam_dnssync import *
+from .ipam_autodns import *

netbox_dns/utilities/{ipam_dnssync.py → ipam_autodns.py}

@@ -13,7 +13,6 @@ from ipam.models import IPAddress, Prefix
 from netbox_dns.models import zone as _zone
 from netbox_dns.models import record as _record
 from netbox_dns.models import view as _view
-from netbox_dns.choices import RecordStatusChoices
 
 
 __all__ = (
@@ -44,36 +43,16 @@ def _get_assigned_views(ip_address):
 
 def _get_record_status(ip_address):
     return (
-        RecordStatusChoices.STATUS_ACTIVE
+        RecordStatusChoices.STATE_ACTIVE
         if ip_address.status
         in settings.PLUGINS_CONFIG["netbox_dns"].get(
-            "dnssync_ipaddress_active_status", []
+            "autodns_ipaddress_active_status", []
         )
         else RecordStatusChoices.STATUS_INACTIVE
     )
 
 
-def _valid_entry(ip_address, zone):
-    return zone.view in _get_assigned_views(ip_address) and dns_name.from_text(
-        ip_address.dns_name
-    ).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):
+def get_zones(ip_address, view=None):
     if view is None:
         views = _get_assigned_views(ip_address)
         if not views:
@@ -82,13 +61,9 @@ def get_zones(ip_address, view=None, old_zone=None):
     else:
         views = [view]
 
-    min_labels = settings.PLUGINS_CONFIG["netbox_dns"].get(
-        "dnssync_minimum_zone_labels", 2
-    )
     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))
+        fqdn.split(i)[1].to_text().rstrip(".") for i in range(3, len(fqdn.labels))
     ]
 
     zones = _zone.Zone.objects.filter(
@@ -97,13 +72,10 @@ def get_zones(ip_address, view=None, old_zone=None):
         active=True,
     )
 
-    zone_map = defaultdict(list)
-
-    if old_zone is not None:
-        zones = zones.exclude(pk=old_zone.pk)
-        if _valid_entry(ip_address, old_zone):
-            zone_map[old_zone.view].append(old_zone)
+    if not zones:
+        return []
 
+    zone_map = defaultdict(list)
     for zone in zones:
         zone_map[zone.view].append(zone)
 
@@ -119,43 +91,35 @@ def check_dns_records(ip_address, zone=None, view=None):
 
     if zone is None:
         zones = get_zones(ip_address, view=view)
+    else:
+        zones = [zone]
 
-        if ip_address.pk is not None:
-            for record in ip_address.netbox_dns_records.filter(zone__in=zones):
-                if not _match_data(ip_address, record):
-                    record.update_from_ip_address(ip_address)
-
-                    if record is not None:
-                        record.clean()
+    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)
+            ):
+                record.update_from_ip_address(ip_address)
 
-            zones = _zone.Zone.objects.filter(
-                pk__in=[zone.pk for zone in zones]
-            ).exclude(
-                pk__in=set(ip_address.netbox_dns_records.values_list("zone", flat=True))
-            )
+                if record is not None:
+                    record.clean()
 
-        for zone in zones:
-            record = _record.Record.create_from_ip_address(
-                ip_address,
-                zone,
+        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)
             )
+        )
 
-            if record is not None:
-                record.clean()
-
-    if ip_address.pk is None:
-        return
-
-    try:
-        new_zone = get_zones(ip_address, old_zone=zone)[0]
-    except IndexError:
-        return
-
-    for record in ip_address.netbox_dns_records.filter(zone=zone):
-        record.update_from_ip_address(ip_address, new_zone)
+    for zone in zones:
+        record = _record.Record.create_from_ip_address(
+            ip_address,
+            zone,
+        )
 
         if record is not None:
-            record.clean(new_zone=new_zone)
+            record.clean()
 
 
 def update_dns_records(ip_address):
@@ -167,14 +131,15 @@ 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 or ip_address.custom_field_data.get(
-                "ipaddress_dns_disabled"
-            ):
+            if record.zone not in zones:
                 record.delete()
                 continue
 
-            record.update_fqdn()
-            if not _match_data(ip_address, record):
+            if (
+                record.fqdn != ip_address.dns_name
+                or record.value != ip_address.address.ip
+                or record.status != _get_record_status(ip_address)
+            ):
                 record.update_from_ip_address(ip_address)
 
                 if record is not None:
@@ -228,9 +193,7 @@ def get_ip_addresses_by_prefix(prefix, check_view=True):
         vrf=prefix.vrf, address__net_host_contained=prefix.prefix
     )
 
-    for exclude_child in (
-        prefix.get_children().filter(netbox_dns_views__isnull=False).distinct()
-    ):
+    for exclude_child in prefix.get_children().filter(netbox_dns_views__isnull=False):
         queryset = queryset.exclude(
             vrf=exclude_child.vrf,
             address__net_host_contained=exclude_child.prefix,
@@ -271,15 +234,13 @@ 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).filter(
-        dns_name__regex=rf"\.{re.escape(zone.name)}\.?$"
-    )
+    queryset = get_ip_addresses_by_view(zone.view)
 
-    return queryset
+    return queryset.filter(dns_name__regex=rf"\.{re.escape(zone.name)}\.?$")
 
 
 def check_record_permission(add=True, change=True, delete=True):
-    checks = locals().copy()
+    checks = locals()
 
     request = current_request.get()
 
@@ -288,8 +249,8 @@ def check_record_permission(add=True, change=True, delete=True):
 
     return all(
         (
-            request.user.has_perm(f"netbox_dns.{perm}_record")
-            for perm, check in checks.items()
+            request.user.has_perm(f"nebox_dns.{perm}_record")
+            for perm, check in locals().items()
             if check
         )
     )

netbox_dns/validators/dns_name.py

@@ -7,7 +7,6 @@ from netbox.plugins.utils import get_plugin_config
 
 __all__ = (
     "validate_fqdn",
-    "validate_rname",
     "validate_generic_name",
     "validate_domain_name",
 )
@@ -58,14 +57,6 @@ 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 .registration_contact import *
+from .contact import *
 from .registrar import *
 from .zone_template import *
 from .record_template import *

netbox_dns/views/contact.py

@@ -0,0 +1,95 @@
+from django.db.models import Q
+
+from netbox.views import generic
+
+from utilities.views import ViewTab, register_model_view
+
+from netbox_dns.models import Contact, Zone
+from netbox_dns.filtersets import ContactFilterSet, ZoneFilterSet
+from netbox_dns.forms import (
+    ContactForm,
+    ContactFilterForm,
+    ContactImportForm,
+    ContactBulkEditForm,
+)
+from netbox_dns.tables import ContactTable, ZoneTable
+
+
+__all__ = (
+    "ContactView",
+    "ContactEditView",
+    "ContactListView",
+    "ContactDeleteView",
+    "ContactBulkImportView",
+    "ContactBulkEditView",
+    "ContactBulkDeleteView",
+    "ContactZoneListView",
+)
+
+
+class ContactView(generic.ObjectView):
+    queryset = Contact.objects.all()
+
+
+class ContactListView(generic.ObjectListView):
+    queryset = Contact.objects.all()
+    table = ContactTable
+    filterset = ContactFilterSet
+    filterset_form = ContactFilterForm
+
+
+class ContactEditView(generic.ObjectEditView):
+    queryset = Contact.objects.all()
+    form = ContactForm
+    default_return_url = "plugins:netbox_dns:contact_list"
+
+
+class ContactDeleteView(generic.ObjectDeleteView):
+    queryset = Contact.objects.all()
+    default_return_url = "plugins:netbox_dns:contact_list"
+
+
+class ContactBulkImportView(generic.BulkImportView):
+    queryset = Contact.objects.all()
+    model_form = ContactImportForm
+    table = ContactTable
+    default_return_url = "plugins:netbox_dns:contact_list"
+
+
+class ContactBulkEditView(generic.BulkEditView):
+    queryset = Contact.objects.all()
+    filterset = ContactFilterSet
+    table = ContactTable
+    form = ContactBulkEditForm
+
+
+class ContactBulkDeleteView(generic.BulkDeleteView):
+    queryset = Contact.objects.all()
+    table = ContactTable
+
+
+@register_model_view(Contact, "zones")
+class ContactZoneListView(generic.ObjectChildrenView):
+    queryset = Contact.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/nameserver.py

@@ -2,7 +2,6 @@ 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 (
@@ -16,13 +15,15 @@ from netbox_dns.tables import NameServerTable, ZoneTable
 
 
 __all__ = (
-    "NameServerView",
     "NameServerListView",
+    "NameServerView",
     "NameServerEditView",
     "NameServerDeleteView",
     "NameServerBulkEditView",
     "NameServerBulkImportView",
     "NameServerBulkDeleteView",
+    "NameServerZoneListView",
+    "NameServerSOAZoneListView",
 )
 
 
@@ -76,11 +77,6 @@ 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,8 +1,6 @@
 from dns import name as dns_name
 
 from netbox.views import generic
-from utilities.views import register_model_view
-from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import RecordFilterSet
 from netbox_dns.forms import (
@@ -18,14 +16,14 @@ from netbox_dns.utilities import value_to_unicode
 
 
 __all__ = (
-    "RecordView",
     "RecordListView",
+    "ManagedRecordListView",
+    "RecordView",
     "RecordEditView",
     "RecordDeleteView",
     "RecordBulkImportView",
     "RecordBulkEditView",
     "RecordBulkDeleteView",
-    "ManagedRecordListView",
 )
 
 
@@ -39,7 +37,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(
+        "zone", "address_record"
+    )
     filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = ManagedRecordTable
@@ -90,11 +90,11 @@ class RecordView(generic.ObjectView):
                 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:
@@ -155,8 +155,3 @@ 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__ = (
-    "RecordTemplateView",
     "RecordTemplateListView",
+    "RecordTemplateView",
     "RecordTemplateEditView",
     "RecordTemplateDeleteView",
     "RecordTemplateBulkImportView",

netbox_dns/views/registrar.py

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

netbox_dns/views/view.py

@@ -1,20 +1,11 @@
 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
 from netbox_dns.filtersets import ViewFilterSet, ZoneFilterSet
-from netbox_dns.forms import (
-    ViewForm,
-    ViewFilterForm,
-    ViewImportForm,
-    ViewBulkEditForm,
-    ViewPrefixEditForm,
-)
+from netbox_dns.forms import ViewForm, ViewFilterForm, ViewImportForm, ViewBulkEditForm
 from netbox_dns.tables import ViewTable, ZoneTable
-from netbox_dns.utilities import get_views_by_prefix
 
 
 __all__ = (
@@ -25,7 +16,7 @@ __all__ = (
     "ViewBulkImportView",
     "ViewBulkEditView",
     "ViewBulkDeleteView",
-    "ViewPrefixEditView",
+    "ViewZoneListView",
 )
 
 
@@ -70,22 +61,6 @@ class ViewBulkDeleteView(generic.BulkDeleteView):
     table = ViewTable
 
 
-class ViewPrefixEditView(generic.ObjectEditView):
-    queryset = Prefix.objects.all()
-    form = ViewPrefixEditForm
-    template_name = "netbox_dns/view/prefix.html"
-
-    def get_extra_context(self, request, instance):
-        parents = instance.get_parents()
-        if parents:
-            return {
-                "inherited_views": get_views_by_prefix(parents.last()),
-                "inherited_from": parents.filter(netbox_dns_views__isnull=False).last(),
-            }
-
-        return {}
-
-
 @register_model_view(View, "zones")
 class ViewZoneListView(generic.ObjectChildrenView):
     queryset = View.objects.all().prefetch_related("zone_set")
@@ -104,8 +79,3 @@ 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,7 +2,6 @@ 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 (
@@ -20,13 +19,18 @@ from netbox_dns.tables import (
 
 
 __all__ = (
-    "ZoneView",
     "ZoneListView",
+    "ZoneView",
     "ZoneEditView",
     "ZoneDeleteView",
     "ZoneBulkImportView",
     "ZoneBulkEditView",
     "ZoneBulkDeleteView",
+    "ZoneRegistrationView",
+    "ZoneRecordListView",
+    "ZoneManagedRecordListView",
+    "ZoneRFC2317ChildZoneListView",
+    "ZoneChildZoneListView",
 )
 
 
@@ -197,8 +201,3 @@ 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,6 +1,5 @@
 from netbox.views import generic
 
-from netbox_dns.models import ZoneTemplate
 from netbox_dns.filtersets import ZoneTemplateFilterSet
 from netbox_dns.forms import (
     ZoneTemplateImportForm,
@@ -8,12 +7,13 @@ from netbox_dns.forms import (
     ZoneTemplateFilterForm,
     ZoneTemplateBulkEditForm,
 )
+from netbox_dns.models import ZoneTemplate
 from netbox_dns.tables import ZoneTemplateTable, RecordTemplateDisplayTable
 
 
 __all__ = (
-    "ZoneTemplateView",
     "ZoneTemplateListView",
+    "ZoneTemplateView",
     "ZoneTemplateEditView",
     "ZoneTemplateDeleteView",
     "ZoneTemplateBulkImportView",

{netbox_plugin_dns-1.1.0.dist-info → netbox_plugin_dns-1.1.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0
+Version: 1.1.0b2
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -48,7 +48,6 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 * Templating for zones and records enables faster creations of zones with given boilerplate object relations, such as name servers, tags, tenants or registration information, or records like standard SPF or MX records that are the same for a subset of zones
-* IPAM DNSsync can be used to automatically create address and pointer records for IP addresses by assigning prefixes to DNS views. When an IP address has a DNS name assigned and there are zones with matching names in the DNS views linked to the IP address' prefix, a matching DNS record will be created in these zones
 
 Other main features include: