Compare commits
2 commits
a8ecfab930
...
f38a1036b7
Author | SHA1 | Date | |
---|---|---|---|
f38a1036b7 | |||
6e624a79a7 |
3 changed files with 11 additions and 21 deletions
|
@ -1,5 +1,4 @@
|
|||
import logging
|
||||
import re
|
||||
from typing import Any, Literal
|
||||
|
||||
import dns.rdata
|
||||
|
@ -102,11 +101,11 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
|
|||
@return: the modified record value
|
||||
"""
|
||||
if escape:
|
||||
value = re.sub(r"\\*;", "\\;", value)
|
||||
fixed = value.replace(";", "\\;")
|
||||
else:
|
||||
value = re.sub(r"\\*;", ";", value)
|
||||
fixed = value.replace("\\;", ";")
|
||||
|
||||
return value
|
||||
return fixed
|
||||
|
||||
def _get_nb_view(self, view: str | None | Literal[False]) -> dict[str, int | str]:
|
||||
"""get the correct netbox view when requested
|
||||
|
|
|
@ -13,7 +13,7 @@ DEFAULT_CONFIG = {
|
|||
|
||||
def test_escape1():
|
||||
nbdns = NetBoxDNSProvider(**DEFAULT_CONFIG)
|
||||
rcd_value = r"v=TLSRPTv1\\; rua=mailto:tlsrpt@example.com"
|
||||
rcd_value = r"v=TLSRPTv1; rua=mailto:tlsrpt@example.com"
|
||||
value = nbdns._fix_semicolon(rcd_value, escape=True)
|
||||
|
||||
assert value == r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
|
@ -21,10 +21,10 @@ def test_escape1():
|
|||
|
||||
def test_escape2():
|
||||
nbdns = NetBoxDNSProvider(**DEFAULT_CONFIG)
|
||||
rcd_value = r"v=TLSRPTv1; rua=mailto:tlsrpt@example.com"
|
||||
rcd_value = r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
value = nbdns._fix_semicolon(rcd_value, escape=True)
|
||||
|
||||
assert value == r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
assert value == r"v=TLSRPTv1\\; rua=mailto:tlsrpt@example.com"
|
||||
|
||||
|
||||
def test_escape3():
|
||||
|
@ -32,7 +32,7 @@ def test_escape3():
|
|||
rcd_value = r"t=y\;o=~\;"
|
||||
value = nbdns._fix_semicolon(rcd_value, escape=True)
|
||||
|
||||
assert value == r"t=y\;o=~\;"
|
||||
assert value == r"t=y\\;o=~\\;"
|
||||
|
||||
|
||||
def test_escape4():
|
||||
|
@ -56,7 +56,7 @@ def test_unescape2():
|
|||
rcd_value = r"v=TLSRPTv1\\; rua=mailto:tlsrpt@example.com"
|
||||
value = nbdns._fix_semicolon(rcd_value, escape=False)
|
||||
|
||||
assert value == r"v=TLSRPTv1; rua=mailto:tlsrpt@example.com"
|
||||
assert value == r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
|
||||
|
||||
def test_unescape3():
|
||||
|
@ -64,7 +64,7 @@ def test_unescape3():
|
|||
rcd_value = r"t=y\\;o=~\;"
|
||||
value = nbdns._fix_semicolon(rcd_value, escape=False)
|
||||
|
||||
assert value == r"t=y;o=~;"
|
||||
assert value == r"t=y\;o=~;"
|
||||
|
||||
|
||||
def test_unescape4():
|
||||
|
|
|
@ -56,7 +56,7 @@ def test_txt2():
|
|||
rcd_value = r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
value = nbdns._format_rdata(rcd_type, rcd_value)
|
||||
|
||||
assert value == r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
assert value == r"v=TLSRPTv1\\; rua=mailto:tlsrpt@example.com"
|
||||
|
||||
|
||||
def test_txt3():
|
||||
|
@ -77,7 +77,7 @@ def test_txt4():
|
|||
rcd_value = r"t=y\;o=~\;"
|
||||
value = nbdns._format_rdata(rcd_type, rcd_value)
|
||||
|
||||
assert value == r"t=y\;o=~\;"
|
||||
assert value == r"t=y\\;o=~\\;"
|
||||
|
||||
|
||||
def test_txt5():
|
||||
|
@ -89,15 +89,6 @@ def test_txt5():
|
|||
assert value == r"t=y\;o=~\;"
|
||||
|
||||
|
||||
def test_txt4():
|
||||
nbdns = NetBoxDNSProvider(**DEFAULT_CONFIG)
|
||||
rcd_type = "TXT"
|
||||
rcd_value = r"v=TLSRPTv1\\; rua=mailto:tlsrpt@example.com"
|
||||
value = nbdns._format_rdata(rcd_type, rcd_value)
|
||||
|
||||
assert value == r"v=TLSRPTv1\; rua=mailto:tlsrpt@example.com"
|
||||
|
||||
|
||||
def test_srv():
|
||||
nbdns = NetBoxDNSProvider(**DEFAULT_CONFIG)
|
||||
rcd_type = "SRV"
|
||||
|
|
Loading…
Reference in a new issue