netbox-plugin-dns 1.2b1__tar.gz → 1.2.1__tar.gz

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2b1
+Version: 1.2.1
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
@@ -8,7 +8,7 @@ Project-URL: Documentation, https://github.com/peteeckel/netbox-plugin-dns/blob/
 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
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_dns/__init__.py

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.2b1"
+__version__ = "1.2.1"
 
 
 def _check_list(setting):
@@ -49,9 +49,11 @@ class DNSConfig(PluginConfig):
         "dnssync_minimum_zone_labels": 2,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
-        "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0
         "tolerate_leading_underscore_types": [
+            RecordTypeChoices.CNAME,
+            RecordTypeChoices.DNAME,
             RecordTypeChoices.SRV,
+            RecordTypeChoices.SVCB,
             RecordTypeChoices.TLSA,
             RecordTypeChoices.TXT,
         ],

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_dns/api/serializers_/record.py

@@ -75,6 +75,7 @@ class RecordSerializer(NetBoxModelSerializer):
             "custom_fields",
             "tenant",
             "ipam_ip_address",
+            "absolute_value",
         )
         brief_fields = (
             "id",

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_dns/filtersets/zone.py

@@ -29,20 +29,6 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("View"),
     )
-    # DEPRECATED: Remove in 1.1
-    name_server_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=NameServer.objects.all(),
-        field_name="nameservers",
-        to_field_name="id",
-        label=_("Nameserver IDs"),
-    )
-    # DEPRECATED: Remove in 1.1
-    name_server = django_filters.ModelMultipleChoiceFilter(
-        queryset=NameServer.objects.all(),
-        field_name="nameservers__name",
-        to_field_name="name",
-        label=_("Nameservers"),
-    )
     nameserver_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers",

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_dns/graphql/types.py

@@ -134,6 +134,7 @@ class NetBoxDNSRecordType(NetBoxObjectType):
     zone: Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
     type: str
     value: str
+    absolute_value: str
     status: str
     ttl: BigInt | None
     managed: bool

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_dns/models/record.py

@@ -3,6 +3,7 @@ import netaddr
 
 import dns
 from dns import name as dns_name
+from dns import rdata
 
 from django.core.exceptions import ValidationError
 from django.db import transaction, models
@@ -22,7 +23,11 @@ from netbox_dns.fields import AddressField
 from netbox_dns.utilities import arpa_to_prefix, name_to_unicode, get_query_from_filter
 from netbox_dns.validators import validate_generic_name, validate_record_value
 from netbox_dns.mixins import ObjectModificationMixin
-from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
+from netbox_dns.choices import (
+    RecordTypeChoices,
+    RecordStatusChoices,
+    RecordClassChoices,
+)
 
 
 __all__ = (
@@ -634,6 +639,43 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 }
             )
 
+    @property
+    def absolute_value(self):
+        zone = dns_name.from_text(self.zone.name)
+        rr = rdata.from_text(RecordClassChoices.IN, self.type, self.value)
+
+        match self.type:
+            case (
+                RecordTypeChoices.CNAME
+                | RecordTypeChoices.DNAME
+                | RecordTypeChoices.NS
+                | RecordTypeChoices.HTTPS
+                | RecordTypeChoices.SRV
+                | RecordTypeChoices.SVCB
+            ):
+                return rr.replace(target=rr.target.derelativize(zone)).to_text()
+
+            case RecordTypeChoices.MX | RecordTypeChoices.RT | RecordTypeChoices.KX:
+                return rr.replace(exchange=rr.exchange.derelativize(zone)).to_text()
+
+            case RecordTypeChoices.RP:
+                return rr.replace(
+                    mbox=rr.mbox.derelativize(zone), txt=rr.txt.derelativize(zone)
+                ).to_text()
+
+            case RecordTypeChoices.NAPTR:
+                return rr.replace(
+                    replacement=rr.replacement.derelativize(zone)
+                ).to_text()
+
+            case RecordTypeChoices.PX:
+                return rr.replace(
+                    map822=rr.map822.derelativize(zone),
+                    mapx400=rr.mapx400.derelativize(zone),
+                ).to_text()
+
+        return self.value
+
     def handle_conflicting_address_records(self):
         if self.ipam_ip_address is None or not self.is_active:
             return

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_dns/validators/dns_value.py

@@ -7,6 +7,8 @@ from dns.exception import SyntaxError
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
 
+from netbox.plugins.utils import get_plugin_config
+
 from netbox_dns.choices import RecordClassChoices, RecordTypeChoices
 from netbox_dns.validators import (
     validate_fqdn,
@@ -76,14 +78,19 @@ def validate_record_value(record):
             ).format(value=record.value, type=record.type, error=exc)
         )
 
+    skip_name_validation = record.type in get_plugin_config(
+        "netbox_dns", "tolerate_non_rfc1035_types", default=[]
+    )
+
     match record.type:
         case RecordTypeChoices.CNAME:
             _validate_idn(rr.target)
-            validate_domain_name(
-                rr.target.to_text(),
-                always_tolerant=True,
-                allow_empty_label=True,
-            )
+            if not skip_name_validation:
+                validate_domain_name(
+                    rr.target.to_text(),
+                    always_tolerant=True,
+                    allow_empty_label=True,
+                )
 
         case (
             RecordTypeChoices.NS
@@ -92,38 +99,46 @@ def validate_record_value(record):
             | RecordTypeChoices.SVCB
         ):
             _validate_idn(rr.target)
-            validate_domain_name(rr.target.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_domain_name(rr.target.to_text(), always_tolerant=True)
 
         case RecordTypeChoices.DNAME:
             _validate_idn(rr.target)
-            validate_domain_name(
-                rr.target.to_text(), always_tolerant=True, zone_name=True
-            )
+            if not skip_name_validation:
+                validate_domain_name(
+                    rr.target.to_text(), always_tolerant=True, zone_name=True
+                )
 
         case RecordTypeChoices.PTR | RecordTypeChoices.NSAP_PTR:
             _validate_idn(rr.target)
-            validate_fqdn(rr.target.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_fqdn(rr.target.to_text(), always_tolerant=True)
 
         case RecordTypeChoices.MX | RecordTypeChoices.RT | RecordTypeChoices.KX:
             _validate_idn(rr.exchange)
-            validate_domain_name(rr.exchange.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_domain_name(rr.exchange.to_text(), always_tolerant=True)
 
         case RecordTypeChoices.NSEC:
             _validate_idn(rr.next)
-            validate_domain_name(rr.next.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_domain_name(rr.next.to_text(), always_tolerant=True)
 
         case RecordTypeChoices.RP:
             _validate_idn(rr.mbox)
-            validate_domain_name(rr.mbox.to_text(), always_tolerant=True)
             _validate_idn(rr.txt)
-            validate_domain_name(rr.txt.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_domain_name(rr.mbox.to_text(), always_tolerant=True)
+                validate_domain_name(rr.txt.to_text(), always_tolerant=True)
 
         case RecordTypeChoices.NAPTR:
             _validate_idn(rr.replacement)
-            validate_generic_name(rr.replacement.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_generic_name(rr.replacement.to_text(), always_tolerant=True)
 
         case RecordTypeChoices.PX:
             _validate_idn(rr.map822)
-            validate_domain_name(rr.map822.to_text(), always_tolerant=True)
             _validate_idn(rr.mapx400)
-            validate_domain_name(rr.mapx400.to_text(), always_tolerant=True)
+            if not skip_name_validation:
+                validate_domain_name(rr.map822.to_text(), always_tolerant=True)
+                validate_domain_name(rr.mapx400.to_text(), always_tolerant=True)

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2b1
+Version: 1.2.1
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
@@ -8,7 +8,7 @@ Project-URL: Documentation, https://github.com/peteeckel/netbox-plugin-dns/blob/
 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
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE

{netbox_plugin_dns-1.2b1 → netbox_plugin_dns-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.2b1"
+version = "1.2.1"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},
@@ -9,7 +9,7 @@ license = {file="LICENCE"}
 readme = "README.md"
 keywords = ["netbox", "netbox-plugin", "dns"]
 classifiers = [
-    "Development Status :: 4 - Beta"
+    "Development Status :: 5 - Production/Stable"
 ]
 dependencies = [
     "dnspython",