netbox-plugin-dns 0.18.2__tar.gz → 0.18.4__tar.gz

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.18.2
-Summary: Netbox DNS is a NetBox plugin for managing DNS data.
+Version: 0.18.4
+Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
 Keywords: netbox,netbox-plugin,dns

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/__init__.py

@@ -1,12 +1,12 @@
 from extras.plugins import PluginConfig
 
-__version__ = "0.18.2"
+__version__ = "0.18.4"
 
 
 class DNSConfig(PluginConfig):
     name = "netbox_dns"
-    verbose_name = "Netbox DNS"
-    description = "Netbox DNS"
+    verbose_name = "NetBox DNS"
+    description = "NetBox plugin for DNS data"
     min_version = "3.5"
     version = __version__
     author = "Peter Eckel"
@@ -27,6 +27,7 @@ class DNSConfig(PluginConfig):
             "SRV",
         ],
         "tolerate_non_rfc1035_types": [],
+        "enable_root_zones": False,
     }
     base_url = "netbox-dns"
 

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/api/urls.py

@@ -1,7 +1,7 @@
 from netbox.api.routers import NetBoxRouter
 
 from netbox_dns.api.views import (
-    NetboxDNSRootView,
+    NetBoxDNSRootView,
     ViewViewSet,
     ZoneViewSet,
     NameServerViewSet,
@@ -9,7 +9,7 @@ from netbox_dns.api.views import (
 )
 
 router = NetBoxRouter()
-router.APIRootView = NetboxDNSRootView
+router.APIRootView = NetBoxDNSRootView
 
 router.register("views", ViewViewSet)
 router.register("zones", ZoneViewSet)

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/api/views.py

@@ -15,13 +15,9 @@ from netbox_dns.filters import ViewFilter, ZoneFilter, NameServerFilter, RecordF
 from netbox_dns.models import View, Zone, NameServer, Record
 
 
-class NetboxDNSRootView(APIRootView):
-    """
-    NetboxDNS API root view
-    """
-
+class NetBoxDNSRootView(APIRootView):
     def get_view_name(self):
-        return "NetboxDNS"
+        return "NetBoxDNS"
 
 
 class ViewViewSet(NetBoxModelViewSet):

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class NetboxDnsConfig(AppConfig):
+class NetBoxDNSConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "netbox_dns"

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/models.py

@@ -289,10 +289,13 @@ class Zone(NetBoxModel):
         )
 
     def __str__(self):
-        try:
-            name = dns_name.from_text(self.name, origin=None).to_unicode()
-        except dns_name.IDNAException:
-            name = self.name
+        if self.name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+            name = ". (root zone)"
+        else:
+            try:
+                name = dns_name.from_text(self.name, origin=None).to_unicode()
+            except dns_name.IDNAException:
+                name = self.name
 
         if self.view:
             return f"[{self.view}] {name}"
@@ -451,7 +454,7 @@ class Zone(NetBoxModel):
         if self.view is None:
             if (
                 Zone.objects.exclude(pk=self.pk)
-                .filter(name=self.name, view__isnull=True)
+                .filter(name=self.name.rstrip("."), view__isnull=True)
                 .exists()
             ):
                 raise ValidationError(
@@ -855,7 +858,7 @@ class Record(NetBoxModel):
             )
 
         if self.type not in get_plugin_config(
-            "netbox_dns", "tolerate_non_rfc1035_types"
+            "netbox_dns", "tolerate_non_rfc1035_types", default=list()
         ):
             try:
                 validate_extended_hostname(
@@ -863,7 +866,9 @@ class Record(NetBoxModel):
                     (
                         self.type
                         in get_plugin_config(
-                            "netbox_dns", "tolerate_leading_underscore_types"
+                            "netbox_dns",
+                            "tolerate_leading_underscore_types",
+                            default=list(),
                         )
                     ),
                 )

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/utilities.py

@@ -4,6 +4,8 @@ from dns import name as dns_name
 from dns.exception import DNSException
 from netaddr import IPNetwork, AddrFormatError
 
+from extras.plugins import get_plugin_config
+
 
 class NameFormatError(Exception):
     pass
@@ -38,6 +40,9 @@ def arpa_to_prefix(arpa_name):
 
 
 def name_to_unicode(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return "."
+
     try:
         return dns_name.from_text(name, origin=None).to_unicode()
     except dns_name.IDNAException:
@@ -54,6 +59,9 @@ def value_to_unicode(value):
 
 
 def normalize_name(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return "."
+
     try:
         return (
             dns_name.from_text(name, origin=dns_name.root)

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/netbox_dns/validators.py

@@ -47,6 +47,9 @@ def validate_extended_hostname(name, tolerate_leading_underscores=False):
 
 
 def validate_domain_name(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return
+
     if get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
         regex = rf"^{UNDERSCORE_LABEL}(\.{UNDERSCORE_LABEL})*\.?$"
     else:

{netbox_plugin_dns-0.18.2 → netbox_plugin_dns-0.18.4}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "0.18.2"
-description = "Netbox DNS is a NetBox plugin for managing DNS data."
+version = "0.18.4"
+description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = ["Peter Eckel <pe-netbox-dns@hindenburgring.com>"]
 homepage = "https://github.com/peteeckel/netbox-plugin-dns"
 repository = "https://github.com/peteeckel/netbox-plugin-dns"