netbox-plugin-dns 1.2b1__py3-none-any.whl → 1.2.1__py3-none-any.whl

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_dns/api/serializers_/record.py

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

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_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_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_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.dist-info → netbox_plugin_dns-1.2.1.dist-info}/METADATA

@@ -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.dist-info → netbox_plugin_dns-1.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=l39Hu_zZEZ1n15O9AzQx0Kr3s8U2EiRDyFIK91e2ErM,3000
+netbox_dns/__init__.py,sha256=y1gmAAuUkeTAfa-FMptZlEVfTPn-5U2YC_Mre2RV1pE,3018
 netbox_dns/apps.py,sha256=JCW5eS-AQBUubDJve1DjP-IRFKTFGQh1NLGWzJpC5MI,151
 netbox_dns/navigation.py,sha256=36clAzlWftW94_VZ3EHu8_btzzA_dah50CLTfoov-O4,6226
 netbox_dns/template_content.py,sha256=T06L7-m4eGrLMeGsCvPpQLAGfn3S2FL7z0Cd1hhbisY,4225
@@ -10,7 +10,7 @@ netbox_dns/api/views.py,sha256=QtA5OQtIDGZoZSSaFTua1TtqARQPSVxLYy8b28CAf0s,3979
 netbox_dns/api/serializers_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/api/serializers_/nameserver.py,sha256=DMkUaLNDt3UtpAD6JDHfo1NMngHWRqHh2-xQeOPlfFM,1171
 netbox_dns/api/serializers_/prefix.py,sha256=kZ1DjDly6VFZamXSxGa57YC6MfZZcI5S7jmGBkVB2_I,551
-netbox_dns/api/serializers_/record.py,sha256=U3B2KhblgLzfiNbMJvYBdogU-JDyVzOlXq-O2RXjVQ8,2378
+netbox_dns/api/serializers_/record.py,sha256=gpfANXhAcPylFWmWpCfwSEHrYy3b9Wl07PIyM4sPKM0,2408
 netbox_dns/api/serializers_/record_template.py,sha256=WAHua_O7v8IB7QL_hOPWjItMtAjWIUZace2rebwjSJA,1519
 netbox_dns/api/serializers_/registrar.py,sha256=xLIaeBJ5ckV1Jf-uyCTFcvsLlsRMlpDtIg6q79vXZic,842
 netbox_dns/api/serializers_/registration_contact.py,sha256=3IGWW5xB9XEBGApCGZCZIxpCmy1Y5jQUbA4GzmtaCik,1024
@@ -32,7 +32,7 @@ netbox_dns/filtersets/record_template.py,sha256=wir5s2QWfDnw0M1wWnzJs9im5ok4l5cT
 netbox_dns/filtersets/registrar.py,sha256=Wh_l-IXRHnJhW7Pyokp3czQZISDKzXnWeSQKp512Drc,977
 netbox_dns/filtersets/registration_contact.py,sha256=903sOcHPRCI0dVzqn1i0pn5VPr_4YpHPh5QE2-akR-Y,1139
 netbox_dns/filtersets/view.py,sha256=IlQz3k2J_N6eSbT9op0KOu3sKLrn-HTsJCcrIqoYgyY,1047
-netbox_dns/filtersets/zone.py,sha256=KjF8oUOIaDkW98pw-OuGNofA4muA922wcDOx3pm6kTc,6818
+netbox_dns/filtersets/zone.py,sha256=zl39SOiYIZxAi3G1wx0s9UEIgh8hG9Bdb46qIXLwMr8,6334
 netbox_dns/filtersets/zone_template.py,sha256=Sm40P33IhN0sOqtjz4JzoBbEK-dTLpfQqYGcM_Xb7KM,3870
 netbox_dns/forms/__init__.py,sha256=axENVF9vX9BtDKCNxrapRjye1NnygUg9BS0BBj6a0io,209
 netbox_dns/forms/nameserver.py,sha256=GJe3ece4yIGwMtLZ6wQihBrJu1dk_ZSiwX-vSU0fRa0,3397
@@ -46,7 +46,7 @@ netbox_dns/forms/zone_template.py,sha256=49vhM-Lc4JAGZD-al4QpPDLfwmpu82JNuX-bxpw
 netbox_dns/graphql/__init__.py,sha256=jghYD6uOSAis6YyLbtI3YJGZfwPw1uL2FBRsHs1EhNk,514
 netbox_dns/graphql/filters.py,sha256=fHCjFIwbPBJJMk2W7HI8LhrfFhCtQtCM9IE8ZMgVafc,1766
 netbox_dns/graphql/schema.py,sha256=q9DQ_hfRB0e6Znq4-IS6UEeTOfMkZmrWkwxcAql1uOA,2270
-netbox_dns/graphql/types.py,sha256=akSquN1AIFbGAVhofioPwVUM__B605PjNj3z4nmMl3c,8068
+netbox_dns/graphql/types.py,sha256=8DjYxWOfjmS5HFW-eaQLl9E12pbg2xlWNwV5CH6ptdY,8092
 netbox_dns/locale/de/LC_MESSAGES/django.mo,sha256=0ij8AzrkWdwtUejXTOTdJJcIRweZfQT3iWjAXrf6hyM,20335
 netbox_dns/locale/en/LC_MESSAGES/django.mo,sha256=GDnSZkfHs3yjtTsll7dksEEej4B50F8pc9RGytZNubM,393
 netbox_dns/management/commands/cleanup_database.py,sha256=1-tAl0Sht80qaNZyfFyUW19Eh9gBUuc7GdbHN4aemGU,5935
@@ -82,7 +82,7 @@ netbox_dns/mixins/__init__.py,sha256=LxTEfpod_RHCyMtnzDljv0_dwqp2z3Q6tqbXW8LTGD8
 netbox_dns/mixins/object_modification.py,sha256=AR64fU5f7g-scNAj9b54eSoS9dpjyOpqrxXVXPcOhY8,1807
 netbox_dns/models/__init__.py,sha256=5Ns9RaemTe5L0L3c6a38RxembWhV-sX9cqfjl05aPQw,313
 netbox_dns/models/nameserver.py,sha256=RmUubF05_K1GMOM7e_geoxXIrS8Xbs1al_xsfwmfd0Q,3389
-netbox_dns/models/record.py,sha256=21jhppbRlVlHd4HJNUtitF4uES09PyvtXqCppbD9SfI,28008
+netbox_dns/models/record.py,sha256=tRzkjdiGIPulzlulQdzEZetObOL_9mhIunZREux6pDg,29397
 netbox_dns/models/record_template.py,sha256=PC4369q_LIJkImp1_jhiTTwy083MXIGpGADnbDHMbqI,5104
 netbox_dns/models/registrar.py,sha256=bjgYgeUtWGg_seDRN1-VV4Pe450ZK85lbALo4J_Zuic,1890
 netbox_dns/models/registration_contact.py,sha256=AkpNy9KbFV9YrISdepqZA1ZfckZSA9u_vfPUAf5Z4H8,3773
@@ -128,7 +128,7 @@ netbox_dns/utilities/dns.py,sha256=QKST49UkCw7n2GyrN3wU5ap6Cw98t1SZxFYJlyG2x70,3
 netbox_dns/utilities/ipam_dnssync.py,sha256=tFphPVluDUS3-4NsUW1_D1dDksA3AgIozf7JAoTIE_w,9533
 netbox_dns/validators/__init__.py,sha256=Mr8TvmcJTa8Pubj8TzbFBKfbHhEmGcr5JdQvczEJ39A,72
 netbox_dns/validators/dns_name.py,sha256=D2SVUHkDAdENspDTzvW4qeWdKC_2KcueqNioqgoHrfA,3628
-netbox_dns/validators/dns_value.py,sha256=9zCbSLfSYEebn9brcA3Q0vVK2qnvZwlv0HxDoge6Yfs,4586
+netbox_dns/validators/dns_value.py,sha256=-mc62mth-hlbPUPe_RlCR7vo1KSD6_gQDXiE8rjB-Cc,5206
 netbox_dns/validators/rfc2317.py,sha256=uKkwxpakiFFKdYA0qy8WSlEnbFwJD4MDw6gGV4F6skg,706
 netbox_dns/views/__init__.py,sha256=axENVF9vX9BtDKCNxrapRjye1NnygUg9BS0BBj6a0io,209
 netbox_dns/views/nameserver.py,sha256=2PaOHtcjaZm0FQMYTmiys-uqQsCBP_RKamW2Jj3rJOY,3896
@@ -139,8 +139,8 @@ netbox_dns/views/registration_contact.py,sha256=u__0w4Nm1_5lnAeFXfTY-cD86facWxIo
 netbox_dns/views/view.py,sha256=a6-wdMyTWoZekiR2VnM3VNSOjX-8L3Qjqqi973UobAA,3391
 netbox_dns/views/zone.py,sha256=H7UPN4T_sn_3ijvXi7t8iteJFs6qqEtVzhvchKOOzCM,7133
 netbox_dns/views/zone_template.py,sha256=vNXG96D6uZJo4KRdsgsTL3d9JzRtiDJg4_h4_3gjAfk,2667
-netbox_plugin_dns-1.2b1.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
-netbox_plugin_dns-1.2b1.dist-info/METADATA,sha256=h9Zr7ncCUaMmqBVt9XTUlsOI9-VjJagU4S6FUBC8yBA,7210
-netbox_plugin_dns-1.2b1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-netbox_plugin_dns-1.2b1.dist-info/top_level.txt,sha256=sA1Rwl1mRKvMC6XHe2ylZ1GF-Q1NGd08XedK9Y4xZc4,11
-netbox_plugin_dns-1.2b1.dist-info/RECORD,,
+netbox_plugin_dns-1.2.1.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
+netbox_plugin_dns-1.2.1.dist-info/METADATA,sha256=GAb1unCGj5FYGlaPyeTAVUCP4Bs5BWw90ndmMzaCOeQ,7223
+netbox_plugin_dns-1.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+netbox_plugin_dns-1.2.1.dist-info/top_level.txt,sha256=sA1Rwl1mRKvMC6XHe2ylZ1GF-Q1NGd08XedK9Y4xZc4,11
+netbox_plugin_dns-1.2.1.dist-info/RECORD,,

{netbox_plugin_dns-1.2b1.dist-info → netbox_plugin_dns-1.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any