netbox-ddns 1.5.0__tar.gz → 1.7.0__tar.gz

{netbox_ddns-1.5.0/netbox_ddns.egg-info → netbox_ddns-1.7.0}/PKG-INFO

@@ -1,22 +1,24 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-ddns
-Version: 1.5.0
+Version: 1.7.0
 Summary: Dynamic DNS Connector for NetBox
 Home-page: https://github.com/sjm-steffann/netbox-ddns
 Author: Sander Steffann
 Author-email: sander@steffann.nl
 License: Apache 2.0
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 3.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: setuptools
 Requires-Dist: dnspython
+Dynamic: license-file
 
 # Dynamic DNS Connector for NetBox
 

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/__init__.py

@@ -1,4 +1,4 @@
-VERSION = '1.5.0'
+VERSION = '1.7.0'
 
 try:
     from netbox.plugins import PluginConfig
@@ -12,8 +12,8 @@ class NetBoxDDNSConfig(PluginConfig):
     name = 'netbox_ddns'
     verbose_name = 'Dynamic DNS'
     version = VERSION
-    min_version = '4.0.0'
-    max_version = '4.2.999'
+    min_version = '4.4.0'
+    max_version = '4.5.999'
     author = 'Sander Steffann'
     author_email = 'sander@steffann.nl'
     description = 'Dynamic DNS Connector for NetBox'

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/api/serializers.py

@@ -26,7 +26,7 @@ class ServerSerializer(NetBoxModelSerializer):
 class ZoneSerializer(NetBoxModelSerializer):
     class Meta:
         model = Zone
-        fields = ('name', 'ttl', 'server')
+        fields = ('name', 'ttl', 'server', 'protocol')
 
 
 class ReverseZoneSerializer(NetBoxModelSerializer):

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/background_tasks.py

@@ -9,7 +9,7 @@ from django_rq import job
 from dns import rcode
 from netaddr import ip
 
-from netbox_ddns.models import ACTION_CREATE, ACTION_DELETE, DNSStatus, RCODE_NO_ZONE, ReverseZone, Zone
+from netbox_ddns.models import ACTION_CREATE, ACTION_DELETE, DNSStatus, RCODE_NO_ZONE, ReverseZone, Zone, Protocol
 from netbox_ddns.utils import get_soa
 
 logger = logging.getLogger('netbox_ddns')
@@ -28,6 +28,17 @@ def status_update(output: List[str], operation: str, response) -> None:
     output.append(message)
 
 
+def send_dns_update(update, server, protocol):
+    """Send DNS update via TCP or UDP. Returns response or None on unknown protocol."""
+    if protocol == Protocol.TCP:
+        return dns.query.tcp(update, server.address, port=server.server_port)
+    elif protocol == Protocol.UDP:
+        return dns.query.udp(update, server.address, port=server.server_port)
+    else:
+        logger.error(f"Unknown protocol {protocol} for server {server}")
+        return None
+
+
 def create_forward(dns_name: str, address: ip.IPAddress, status: Optional[DNSStatus], output: List[str]):
     if status:
         status.forward_action = ACTION_CREATE
@@ -38,6 +49,7 @@ def create_forward(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
 
         # Check the SOA, we don't want to write to a parent zone if it has delegated authority
         soa = get_soa(zone.name)
+        protocol = zone.server.protocol
         if soa == zone.name:
             record_type = 'A' if address.version == 4 else 'AAAA'
             update = zone.server.create_update(zone.name)
@@ -47,7 +59,9 @@ def create_forward(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
                 record_type,
                 str(address)
             )
-            response = dns.query.udp(update, zone.server.address, port=zone.server.server_port)
+            response = send_dns_update(update, zone.server, protocol)
+            if response is None:
+                return
             status_update(output, f'Adding {dns_name} {record_type} {address}', response)
             if status:
                 status.forward_rcode = response.rcode()
@@ -72,6 +86,7 @@ def delete_forward(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
 
         # Check the SOA, we don't want to write to a parent zone if it has delegated authority
         soa = get_soa(zone.name)
+        protocol = zone.server.protocol
         if soa == zone.name:
             record_type = 'A' if address.version == 4 else 'AAAA'
             update = zone.server.create_update(zone.name)
@@ -80,7 +95,9 @@ def delete_forward(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
                 record_type,
                 str(address)
             )
-            response = dns.query.udp(update, zone.server.address, port=zone.server.server_port)
+            response = send_dns_update(update, zone.server, protocol)
+            if response is None:
+                return
             status_update(output, f'Deleting {dns_name} {record_type} {address}', response)
             if status:
                 status.forward_rcode = response.rcode()
@@ -106,6 +123,7 @@ def create_reverse(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
 
         # Check the SOA, we don't want to write to a parent zone if it has delegated authority
         soa = get_soa(record_name)
+        protocol = zone.server.protocol
         if soa == zone.name:
             update = zone.server.create_update(zone.name)
             update.add(
@@ -114,7 +132,9 @@ def create_reverse(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
                 'ptr',
                 dns_name
             )
-            response = dns.query.udp(update, zone.server.address, port=zone.server.server_port)
+            response = send_dns_update(update, zone.server, protocol)
+            if response is None:
+                return
             status_update(output, f'Adding {record_name} PTR {dns_name}', response)
             if status:
                 status.reverse_rcode = response.rcode()
@@ -140,6 +160,7 @@ def delete_reverse(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
 
         # Check the SOA, we don't want to write to a parent zone if it has delegated authority
         soa = get_soa(record_name)
+        protocol = zone.server.protocol
         if soa == zone.name:
             update = zone.server.create_update(zone.name)
             update.delete(
@@ -147,7 +168,9 @@ def delete_reverse(dns_name: str, address: ip.IPAddress, status: Optional[DNSSta
                 'ptr',
                 dns_name
             )
-            response = dns.query.udp(update, zone.server.address, port=zone.server.server_port)
+            response = send_dns_update(update, zone.server, protocol)
+            if response is None:
+                return
             status_update(output, f'Deleting {record_name} PTR {dns_name}', response)
             if status:
                 status.reverse_rcode = response.rcode()

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/forms.py

@@ -34,13 +34,13 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
 
 class ServerForm(NetBoxModelForm):
     fieldsets = (
-        FieldSet('server', 'server_port', name='Server'),
+        FieldSet('server', 'server_port', 'protocol', name='Server'),
         FieldSet('tsig_key_name', 'tsig_algorithm', "tsig_key", name='Authentication'),
     )
 
     class Meta:
         model = Server
-        fields = ('server', 'server_port', 'tsig_key_name', 'tsig_algorithm', "tsig_key")
+        fields = ('server', 'server_port', 'protocol', 'tsig_key_name', 'tsig_algorithm', "tsig_key")
 
 
 class ExtraDNSNameIPAddressForm(NetBoxModelForm):

netbox_ddns-1.7.0/netbox_ddns/migrations/0014_alter_extradnsname_name.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.5 on 2025-09-01 09:17
+
+import netbox_ddns.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_ddns', '0013_reversezone_created_reversezone_custom_field_data_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extradnsname',
+            name='name',
+            field=models.CharField(max_length=255, validators=[netbox_ddns.validators.DNSNameValidator()]),
+        ),
+    ]

netbox_ddns-1.7.0/netbox_ddns/migrations/0015_server_protocol.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.6 on 2025-10-01 14:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_ddns', '0014_alter_extradnsname_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='server',
+            name='protocol',
+            field=models.CharField(default='udp', max_length=3),
+        ),
+    ]

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/models.py

@@ -18,7 +18,7 @@ from ipam.fields import IPNetworkField
 from ipam.models import IPAddress
 from utilities.querysets import RestrictedQuerySet
 from .utils import normalize_fqdn
-from .validators import HostnameAddressValidator, HostnameValidator, validate_base64, MinValueValidator, \
+from .validators import DNSNameValidator, HostnameAddressValidator, HostnameValidator, validate_base64, MinValueValidator, \
     MaxValueValidator
 
 logger = logging.getLogger('netbox_ddns')
@@ -64,6 +64,9 @@ def get_rcode_display(code):
     else:
         return _('Unknown response: {}').format(code)
 
+class Protocol(models.TextChoices):
+    UDP = 'udp', _('UDP')
+    TCP = 'tcp', _('TCP')
 
 class Server(NetBoxModel):
     server = models.CharField(
@@ -95,6 +98,12 @@ class Server(NetBoxModel):
         validators=[validate_base64],
         help_text=_('in base64 notation'),
     )
+    protocol = models.CharField(
+        verbose_name=_('Protocol'),
+        max_length=3,
+        choices=Protocol.choices,
+        default=Protocol.UDP,
+    )
 
     class Meta:
         unique_together = (
@@ -119,7 +128,10 @@ class Server(NetBoxModel):
 
     @property
     def address(self) -> Optional[str]:
-        return socket.gethostbyname(self.server)
+        addrinfo = socket.getaddrinfo(self.server, self.server_port, proto=socket.IPPROTO_UDP)
+        for family, _, _, _, sockaddr in addrinfo:
+            if family in (socket.AF_INET, socket.AF_INET6) and sockaddr[0]:
+                return sockaddr[0]
 
     def create_update(self, zone: str) -> dns.update.Update:
         return dns.update.Update(
@@ -374,7 +386,7 @@ class ExtraDNSName(NetBoxModel):
     name = models.CharField(
         verbose_name=_('DNS name'),
         max_length=255,
-        validators=[HostnameValidator()],
+        validators=[DNSNameValidator()],
     )
 
     last_update = models.DateTimeField(

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/navigation.py

@@ -4,6 +4,10 @@ menu = PluginMenu(
     label='DDNS',
     groups=(
         ('Configuration', (
+            PluginMenuItem(
+                link='plugins:netbox_ddns:managed_dns_name_list',
+                link_text='DNS Names',
+            ),
             PluginMenuItem(
                 link='plugins:netbox_ddns:server_list',
                 link_text='DDNS Servers',

netbox_ddns-1.7.0/netbox_ddns/tables.py

@@ -0,0 +1,96 @@
+import django_tables2 as tables
+from django_tables2 import LinkColumn, RelatedLinkColumn
+
+from netbox_ddns.models import ExtraDNSName, Server, ReverseZone, Zone
+
+from netbox.tables import NetBoxTable
+
+MANAGED_DNS_ACTIONS = """
+<a href="{{ record.view_url }}" class="btn btn-sm btn-outline-primary" title="View">
+    <i class="mdi mdi-eye"></i>
+</a>
+<a href="{{ record.edit_url }}" class="btn btn-sm btn-outline-warning" title="Edit">
+    <i class="mdi mdi-pencil"></i>
+</a>
+{% if record.delete_url %}
+<a href="{{ record.delete_url }}" class="btn btn-sm btn-outline-danger" title="Delete">
+    <i class="mdi mdi-delete"></i>
+</a>
+{% endif %}
+"""
+
+FORWARD_DNS = """
+    {% if record.forward_action is not None %}
+        {{ record.get_forward_action_display }}:
+        {{ record.get_forward_rcode_html_display }}
+    {% else %}
+        <span class="text-muted">Not created</span>
+    {% endif %}
+"""
+
+
+class ReverseZoneTable(NetBoxTable):
+    name = LinkColumn()
+    server = RelatedLinkColumn()
+
+    class Meta(NetBoxTable.Meta):
+        model = ReverseZone
+        fields = ("id", "name", "prefix", "server", "ttl")
+
+
+class ZoneTable(NetBoxTable):
+    name = LinkColumn()
+    server = RelatedLinkColumn()
+
+    class Meta(NetBoxTable.Meta):
+        model = Zone
+        fields = ("id", "name", "server", "ttl")
+
+
+class ServerTable(NetBoxTable):
+    server = LinkColumn()
+
+    class Meta(NetBoxTable.Meta):
+        model = Server
+        fields = ("id", "server", "server_port", "protocol", "tsig_key_name", "tsig_algorithm")
+
+
+class ExtraDNSNameTable(NetBoxTable):
+    ip_address = RelatedLinkColumn()
+    name = LinkColumn()
+    forward_dns = tables.TemplateColumn(template_code=FORWARD_DNS)
+
+    class Meta(NetBoxTable.Meta):
+        model = ExtraDNSName
+        fields = ('id', 'name', 'ip_address', 'last_update', 'forward_dns')
+
+
+class ManagedDNSNameTable(tables.Table):
+    """Table for primary DNS names (from IPAddress.dns_name)."""
+    dns_name = tables.Column(
+        accessor='dns_name',
+        linkify=lambda record: record.view_url,
+    )
+    ip_address = tables.Column(
+        accessor='ip_address',
+        linkify=lambda record: record.ip_address.get_absolute_url(),
+    )
+    zone = tables.Column(
+        accessor='zone',
+        linkify=lambda record: record.zone.get_absolute_url() if record.zone else None,
+    )
+    forward_status = tables.TemplateColumn(
+        template_code='{{ record.forward_status_html|safe }}',
+        verbose_name='Forward DNS',
+    )
+    actions = tables.TemplateColumn(
+        template_code=MANAGED_DNS_ACTIONS,
+        verbose_name='Actions',
+        orderable=False,
+    )
+
+    def render_zone(self, value):
+        return value if value else '—'
+
+    class Meta:
+        attrs = {'class': 'table table-hover object-list'}

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/template_content.py

@@ -6,7 +6,10 @@ from . import tables
 
 
 class ReverseZoneRecreate(PluginTemplateExtension):
+    # NetBox up to 4.1
     model = 'netbox_ddns.reversezone'
+    # NetBox from 4.2, required to be present as of NetBox 4.3
+    models = [model]
 
     def buttons(self):
         """
@@ -20,7 +23,10 @@ class ReverseZoneRecreate(PluginTemplateExtension):
 
 
 class ZoneRecreate(PluginTemplateExtension):
+    # NetBox up to 4.1
     model = 'netbox_ddns.zone'
+    # NetBox from 4.2, required to be present as of NetBox 4.3
+    models = [model]
 
     def buttons(self):
         """
@@ -34,7 +40,10 @@ class ZoneRecreate(PluginTemplateExtension):
 
 
 class DNSInfo(PluginTemplateExtension):
+    # NetBox up to 4.1
     model = 'ipam.ipaddress'
+    # NetBox from 4.2, required to be present as of NetBox 4.3
+    models = [model]
 
     def buttons(self):
         """

netbox_ddns-1.7.0/netbox_ddns/templates/netbox_ddns/managed_dns_names.html

@@ -0,0 +1,17 @@
+{% extends 'base/layout.html' %}
+{% load render_table from django_tables2 %}
+
+{% block title %}DNS Names{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col col-12">
+            <div class="card">
+                <h5 class="card-header">DNS Names</h5>
+                <div class="card-body table-responsive">
+                    {% render_table table 'inc/table.html' %}
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock content %}

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/templates/netbox_ddns/server.html

@@ -19,6 +19,12 @@
                             {{ object.server_port }}
                         </td>
                     </tr>
+                    <tr>
+                        <th scope="row">Protocol</th>
+                        <td>
+                            {{ object.protocol }}
+                        </td>
+                    </tr>
                 </table>
             </div>
             <div class="card">
@@ -65,4 +71,4 @@
         </div>
     </div>
 
-{% endblock content %}
+{% endblock content %}

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/urls.py

@@ -1,10 +1,16 @@
 from django.urls import path, include
 
 from utilities.urls import get_model_urls
-from .views import ExtraDNSNameCreateView, IPAddressDNSNameRecreateView, \
-     UpdateForwardZone, UpdateReverseZone
+from .views import (
+    ExtraDNSNameCreateView,
+    IPAddressDNSNameRecreateView,
+    ManagedDNSNameListView,
+    UpdateForwardZone,
+    UpdateReverseZone,
+)
 
 urlpatterns = [
+    path('managed-dns-names/', ManagedDNSNameListView.as_view(), name='managed_dns_name_list'),
 
     path('extra-dns-names/', include(get_model_urls('netbox_ddns', 'extradnsname', detail=False))),
     path('extra-dns-names/<int:pk>/', include(get_model_urls('netbox_ddns', 'extradnsname'))),

netbox_ddns-1.7.0/netbox_ddns/utils.py

@@ -0,0 +1,123 @@
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, List, Optional
+
+import dns.rdatatype
+import dns.resolver
+
+if TYPE_CHECKING:
+    from ipam.models import IPAddress
+    from netbox_ddns.models import Zone
+
+
+@dataclass
+class ManagedDNSNameRow:
+    """Primary DNS name from IPAddress, with optional zone."""
+    dns_name: str
+    ip_address: 'IPAddress'
+    zone: Optional['Zone']
+    obj: 'IPAddress'
+    view_url: str = ''
+    edit_url: str = ''
+    delete_url: Optional[str] = None
+    forward_status_html: str = ''
+
+
+def _find_zone_for_dns_name(dns_name: str, zones_by_name: dict) -> Optional['Zone']:
+    """In-memory zone lookup."""
+    parts = dns_name.lower().rstrip('.').split('.')
+    for i in range(len(parts)):
+        candidate = '.'.join(parts[i:])
+        for suffix in (candidate + '.', candidate):
+            if suffix in zones_by_name:
+                return zones_by_name[suffix]
+    return None
+
+
+def get_managed_dns_names(user) -> List[ManagedDNSNameRow]:
+    """
+    Return all primary DNS names (from IPAddress.dns_name), with or without a zone.
+    Extra DNS names are shown in the separate Extra DNS Names view.
+    """
+    from django.urls import reverse
+
+    from dns import rcode
+
+    from ipam.models import IPAddress
+    from netbox_ddns.models import ACTION_CHOICES, DNSStatus, Zone, get_rcode_display
+
+    rows: List[ManagedDNSNameRow] = []
+    no_zone_status = '<span class="text-muted">No zone configured</span>'
+
+    zones = list(Zone.objects.all().restrict(user, 'view'))
+    zones_by_name = {z.name: z for z in zones}
+    for z in zones:
+        n = z.name.rstrip('.')
+        if n != z.name:
+            zones_by_name[n] = z
+
+    ip_addresses = (
+        IPAddress.objects.filter(dns_name__isnull=False)
+        .exclude(dns_name='')
+        .restrict(user, 'view')
+        .prefetch_related('dnsstatus')
+        .order_by('dns_name')
+    )
+
+    for ip_address in ip_addresses:
+        zone = _find_zone_for_dns_name(ip_address.dns_name, zones_by_name)
+        if zone is None:
+            forward_status = no_zone_status
+        else:
+            try:
+                status = ip_address.dnsstatus
+                if status.forward_action is not None:
+                    output = next(
+                        label for value, label in ACTION_CHOICES if value == status.forward_action
+                    )
+                    output += ': '
+                    output += get_rcode_display(status.forward_rcode) or ''
+                    colour = 'green' if status.forward_rcode == rcode.NOERROR else 'red'
+                    forward_status = f'<span style="color:{colour}">{output}</span>'
+                else:
+                    forward_status = '<span class="text-muted">Not created</span>'
+            except DNSStatus.DoesNotExist:
+                forward_status = '<span class="text-muted">Not created</span>'
+
+        rows.append(ManagedDNSNameRow(
+            dns_name=ip_address.dns_name,
+            ip_address=ip_address,
+            zone=zone,
+            obj=ip_address,
+            view_url=ip_address.get_absolute_url(),
+            edit_url=reverse('ipam:ipaddress_edit', args=[ip_address.pk]),
+            delete_url=None,
+            forward_status_html=forward_status,
+        ))
+
+    return rows
+
+
+def normalize_fqdn(dns_name: str) -> str:
+    if not dns_name:
+        return ''
+
+    return dns_name.lower().rstrip('.') + '.'
+
+
+def get_soa(dns_name: str) -> str:
+    parts = dns_name.rstrip('.').split('.')
+    for i in range(len(parts)):
+        zone_name = normalize_fqdn('.'.join(parts[i:]))
+
+        try:
+            dns.resolver.query(zone_name, dns.rdatatype.SOA)
+            return zone_name
+        except dns.resolver.NoAnswer:
+            # The name exists, but has no SOA. Continue one level further up
+            continue
+        except dns.resolver.NXDOMAIN as e:
+            # Look for a SOA record in the authority section
+            for query, response in e.responses().items():
+                for rrset in response.authority:
+                    if rrset.rdtype == dns.rdatatype.SOA:
+                        return rrset.name.to_text()

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/validators.py

@@ -21,3 +21,9 @@ def validate_base64(value):
         base64.b64decode(value, validate=True)
     except binascii.Error:
         raise ValidationError('Invalid base64 string')
+
+class DNSNameValidator(RegexValidator):
+    regex = r"^([0-9A-Za-z_-]+|\*)(\.[0-9A-Za-z_-]+)*\.?$"
+    message = _(
+        "Only alphanumeric characters, asterisks, hyphens, periods, and underscores are allowed in DNS names"
+    )

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns/views.py

@@ -1,6 +1,6 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import gettext as _
 
 from ipam.models import IPAddress
@@ -9,16 +9,34 @@ from netbox_ddns.background_tasks import dns_create
 from netbox_ddns.filtersets import ServerFilterSet, ZoneFilterSet, ReverseZoneFilterSet, ExtraDNSNameFilterSet
 from netbox_ddns.forms import ServerForm, ZoneForm, ReverseZoneForm, ExtraDNSNameIPAddressForm, ExtraDNSNameForm
 from netbox_ddns.models import DNSStatus, ExtraDNSName, Server, Zone, ReverseZone
-from netbox_ddns.tables import ServerTable, ZoneTable, ReverseZoneTable, ExtraDNSNameTable
-from netbox_ddns.utils import normalize_fqdn
+from netbox_ddns.tables import ManagedDNSNameTable, ServerTable, ZoneTable, ReverseZoneTable, ExtraDNSNameTable
+from netbox_ddns.utils import get_managed_dns_names, normalize_fqdn
 
 from netbox.views.generic import ObjectDeleteView, ObjectEditView, ObjectView, ObjectListView, BulkDeleteView
 
+from django_tables2 import RequestConfig
 from django.views.generic import View
 
 from utilities.views import register_model_view, GetRelatedModelsMixin
 
 
+# Managed DNS Names (primary DNS names from IP addresses)
+class ManagedDNSNameListView(PermissionRequiredMixin, View):
+    """List of all primary DNS names (from IPAddress.dns_name). Extra DNS names have a separate view."""
+    permission_required = 'netbox_ddns.view_zone'
+
+    def get(self, request):
+        rows = get_managed_dns_names(request.user)
+        table = ManagedDNSNameTable(rows)
+        RequestConfig(request).configure(table)
+
+        return render(
+            request,
+            'netbox_ddns/managed_dns_names.html',
+            {'table': table},
+        )
+
+
 # ReverseZone
 @register_model_view(ReverseZone)
 class ReverseZoneView(ObjectView):

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0/netbox_ddns.egg-info}/PKG-INFO

@@ -1,22 +1,24 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-ddns
-Version: 1.5.0
+Version: 1.7.0
 Summary: Dynamic DNS Connector for NetBox
 Home-page: https://github.com/sjm-steffann/netbox-ddns
 Author: Sander Steffann
 Author-email: sander@steffann.nl
 License: Apache 2.0
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 3.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: setuptools
 Requires-Dist: dnspython
+Dynamic: license-file
 
 # Dynamic DNS Connector for NetBox
 

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/netbox_ddns.egg-info/SOURCES.txt

@@ -42,8 +42,11 @@ netbox_ddns/migrations/0010_extradnsname_created_extradnsname_custom_field_data_
 netbox_ddns/migrations/0011_server_created_server_custom_field_data_and_more.py
 netbox_ddns/migrations/0012_zone_created_zone_custom_field_data_and_more.py
 netbox_ddns/migrations/0013_reversezone_created_reversezone_custom_field_data_and_more.py
+netbox_ddns/migrations/0014_alter_extradnsname_name.py
+netbox_ddns/migrations/0015_server_protocol.py
 netbox_ddns/migrations/__init__.py
 netbox_ddns/templates/netbox_ddns/extradnsname.html
+netbox_ddns/templates/netbox_ddns/managed_dns_names.html
 netbox_ddns/templates/netbox_ddns/reversezone.html
 netbox_ddns/templates/netbox_ddns/server.html
 netbox_ddns/templates/netbox_ddns/update_reverse_zone.html

{netbox_ddns-1.5.0 → netbox_ddns-1.7.0}/setup.cfg

@@ -10,18 +10,19 @@ url = https://github.com/sjm-steffann/netbox-ddns
 license = Apache 2.0
 license_file = LICENSE.txt
 classifiers = 
-	Development Status :: 2 - Pre-Alpha
+	Development Status :: 5 - Production/Stable
 	Framework :: Django
 	Framework :: Django :: 3.0
 	License :: OSI Approved :: Apache Software License
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 
 [options]
 zip_safe = False
 include_package_data = True
 packages = find:
-python_requires = >=3.10
+python_requires = >=3.11
 install_requires = 
 	setuptools
 	dnspython

netbox_ddns-1.5.0/netbox_ddns/tables.py

@@ -1,51 +0,0 @@
-import django_tables2 as tables
-from django_tables2 import LinkColumn, RelatedLinkColumn
-
-from netbox_ddns.models import ExtraDNSName, Server, ReverseZone, Zone
-
-from netbox.tables import NetBoxTable
-
-FORWARD_DNS = """
-    {% if record.forward_action is not None %}
-        {{ record.get_forward_action_display }}:
-        {{ record.get_forward_rcode_html_display }}
-    {% else %}
-        <span class="text-muted">Not created</span>
-    {% endif %}
-"""
-
-
-class ReverseZoneTable(NetBoxTable):
-    name = LinkColumn()
-    server = RelatedLinkColumn()
-
-    class Meta(NetBoxTable.Meta):
-        model = ReverseZone
-        fields = ("id", "name", "prefix", "server", "ttl")
-
-
-class ZoneTable(NetBoxTable):
-    name = LinkColumn()
-    server = RelatedLinkColumn()
-
-    class Meta(NetBoxTable.Meta):
-        model = Zone
-        fields = ("id", "name", "server", "ttl")
-
-
-class ServerTable(NetBoxTable):
-    server = LinkColumn()
-
-    class Meta(NetBoxTable.Meta):
-        model = Server
-        fields = ("id", "server", "server_port", "tsig_key_name", "tsig_algorithm")
-
-
-class ExtraDNSNameTable(NetBoxTable):
-    ip_address = RelatedLinkColumn()
-    name = LinkColumn()
-    forward_dns = tables.TemplateColumn(template_code=FORWARD_DNS)
-
-    class Meta(NetBoxTable.Meta):
-        model = ExtraDNSName
-        fields = ('id', 'name', 'ip_address', 'last_update', 'forward_dns')

netbox_ddns-1.5.0/netbox_ddns/utils.py

@@ -1,28 +0,0 @@
-import dns.rdatatype
-import dns.resolver
-
-
-def normalize_fqdn(dns_name: str) -> str:
-    if not dns_name:
-        return ''
-
-    return dns_name.lower().rstrip('.') + '.'
-
-
-def get_soa(dns_name: str) -> str:
-    parts = dns_name.rstrip('.').split('.')
-    for i in range(len(parts)):
-        zone_name = normalize_fqdn('.'.join(parts[i:]))
-
-        try:
-            dns.resolver.query(zone_name, dns.rdatatype.SOA)
-            return zone_name
-        except dns.resolver.NoAnswer:
-            # The name exists, but has no SOA. Continue one level further up
-            continue
-        except dns.resolver.NXDOMAIN as e:
-            # Look for a SOA record in the authority section
-            for query, response in e.responses().items():
-                for rrset in response.authority:
-                    if rrset.rdtype == dns.rdatatype.SOA:
-                        return rrset.name.to_text()