You've already forked directdnsonly
fix: correct RDATA encoding and batch processing in CoreDNS MySQL backend 🐛
- Fix dnspython silently relativizing in-zone FQDN targets to '@' by calling rdata.to_text(origin=origin, relativize=False); CoreDNS MySQL requires absolute FQDNs in RDATA and was serving '.' for any CNAME/MX pointing to the zone apex - Reorder write_zone to delete stale records before inserting new ones so a brief NXDOMAIN is preferred over briefly serving duplicate records - Rework save-queue batch loop: keep batch open until queue is empty rather than closing after a fixed timeout, so sequential DA zone pushes accumulate into a single batch - Add managed_by='directadmin' to _ensure_zone_exists for new and legacy NULL rows
This commit is contained in:
@@ -199,90 +199,3 @@ def test_write_zone_migrates_null_managed_by(mysql_backend):
|
||||
assert zone.managed_by == "directadmin"
|
||||
session.close()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# _relativize_name — apex/in-zone/external normalisation for CoreDNS MySQL
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def test_relativize_apex_symbol(mysql_backend):
|
||||
assert mysql_backend._relativize_name("example.com", "@") == "@"
|
||||
|
||||
|
||||
def test_relativize_dot(mysql_backend):
|
||||
assert mysql_backend._relativize_name("example.com", ".") == "@"
|
||||
|
||||
|
||||
def test_relativize_zone_fqdn_to_apex(mysql_backend):
|
||||
"""Full zone FQDN must become '@' — storing it as-is causes CoreDNS to serve '.'."""
|
||||
assert mysql_backend._relativize_name("example.com", "example.com.") == "@"
|
||||
|
||||
|
||||
def test_relativize_in_zone_subdomain(mysql_backend):
|
||||
assert mysql_backend._relativize_name("example.com", "mail.example.com.") == "mail"
|
||||
|
||||
|
||||
def test_relativize_external_fqdn_unchanged(mysql_backend):
|
||||
assert mysql_backend._relativize_name("example.com", "mail.google.com.") == "mail.google.com."
|
||||
|
||||
|
||||
def test_relativize_already_relative_unchanged(mysql_backend):
|
||||
assert mysql_backend._relativize_name("example.com", "mail") == "mail"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# MX record normalization via write_zone
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
MX_APEX_ZONE = """\
|
||||
$ORIGIN example.com.
|
||||
$TTL 300
|
||||
example.com. 300 IN SOA ns.example.com. admin.example.com. (2023 3600 1800 604800 86400)
|
||||
example.com. 300 IN MX 0 example.com.
|
||||
example.com. 300 IN MX 10 mail.google.com.
|
||||
"""
|
||||
|
||||
MX_RELATIVE_ZONE = """\
|
||||
$ORIGIN example.com.
|
||||
$TTL 300
|
||||
example.com. 300 IN SOA ns.example.com. admin.example.com. (2023 3600 1800 604800 86400)
|
||||
example.com. 300 IN MX 0 @
|
||||
example.com. 300 IN MX 10 mail.google.com.
|
||||
"""
|
||||
|
||||
|
||||
def _get_mx_data(mysql_backend, zone_name="example.com"):
|
||||
session = mysql_backend.Session()
|
||||
zone = session.execute(
|
||||
select(Zone).filter_by(zone_name=zone_name + ".")
|
||||
).scalar_one_or_none()
|
||||
records = (
|
||||
session.execute(
|
||||
select(Record).filter_by(zone_id=zone.id, type="MX")
|
||||
).scalars().all()
|
||||
)
|
||||
result = {r.data for r in records}
|
||||
session.close()
|
||||
return result
|
||||
|
||||
|
||||
def test_mx_apex_fqdn_stored_as_at_symbol(mysql_backend):
|
||||
"""MX pointing to zone FQDN must be stored as '0 @'."""
|
||||
mysql_backend.write_zone("example.com", MX_APEX_ZONE)
|
||||
mx_data = _get_mx_data(mysql_backend)
|
||||
assert "0 @" in mx_data
|
||||
assert not any("example.com" in d for d in mx_data)
|
||||
|
||||
|
||||
def test_mx_apex_at_symbol_stored_as_at_symbol(mysql_backend):
|
||||
"""MX '0 @' (already relative) must remain '0 @'."""
|
||||
mysql_backend.write_zone("example.com", MX_RELATIVE_ZONE)
|
||||
mx_data = _get_mx_data(mysql_backend)
|
||||
assert "0 @" in mx_data
|
||||
|
||||
|
||||
def test_mx_external_fqdn_stored_unchanged(mysql_backend):
|
||||
"""External MX target must be stored as absolute FQDN."""
|
||||
mysql_backend.write_zone("example.com", MX_APEX_ZONE)
|
||||
mx_data = _get_mx_data(mysql_backend)
|
||||
assert "10 mail.google.com." in mx_data
|
||||
|
||||
@@ -24,7 +24,9 @@ def _make_json_response(domains_list, total_pages=1):
|
||||
|
||||
|
||||
def _client():
|
||||
return DirectAdminClient("da1.example.com", 2222, "admin", "secret", ssl=True, verify_ssl=True)
|
||||
return DirectAdminClient(
|
||||
"da1.example.com", 2222, "admin", "secret", ssl=True, verify_ssl=True
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -105,7 +107,9 @@ def test_html_response_returns_none():
|
||||
|
||||
|
||||
def test_connection_error_returns_none():
|
||||
with patch("requests.get", side_effect=requests.exceptions.ConnectionError("refused")):
|
||||
with patch(
|
||||
"requests.get", side_effect=requests.exceptions.ConnectionError("refused")
|
||||
):
|
||||
result = _client().list_domains()
|
||||
|
||||
assert result is None
|
||||
@@ -119,7 +123,9 @@ def test_timeout_returns_none():
|
||||
|
||||
|
||||
def test_ssl_error_returns_none():
|
||||
with patch("requests.get", side_effect=requests.exceptions.SSLError("cert verify failed")):
|
||||
with patch(
|
||||
"requests.get", side_effect=requests.exceptions.SSLError("cert verify failed")
|
||||
):
|
||||
result = _client().list_domains()
|
||||
|
||||
assert result is None
|
||||
@@ -131,12 +137,16 @@ def test_ssl_error_returns_none():
|
||||
|
||||
|
||||
def test_parse_standard_querystring():
|
||||
result = DirectAdminClient._parse_legacy_domain_list("list[]=example.com&list[]=test.com")
|
||||
result = DirectAdminClient._parse_legacy_domain_list(
|
||||
"list[]=example.com&list[]=test.com"
|
||||
)
|
||||
assert result == {"example.com", "test.com"}
|
||||
|
||||
|
||||
def test_parse_newline_separated():
|
||||
result = DirectAdminClient._parse_legacy_domain_list("list[]=example.com\nlist[]=test.com")
|
||||
result = DirectAdminClient._parse_legacy_domain_list(
|
||||
"list[]=example.com\nlist[]=test.com"
|
||||
)
|
||||
assert result == {"example.com", "test.com"}
|
||||
|
||||
|
||||
|
||||
@@ -55,7 +55,9 @@ DA_CLIENT_PATH = "directdnsonly.app.reconciler.DirectAdminClient"
|
||||
|
||||
def _patch_da(return_value):
|
||||
"""Patch DirectAdminClient so list_domains returns a fixed value."""
|
||||
return patch(DA_CLIENT_PATH, **{"return_value.list_domains.return_value": return_value})
|
||||
return patch(
|
||||
DA_CLIENT_PATH, **{"return_value.list_domains.return_value": return_value}
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -233,7 +235,12 @@ def test_heal_skips_domains_without_zone_data(delete_queue, patch_connect):
|
||||
registry, _ = _make_backend_registry(zone_exists_return=False)
|
||||
|
||||
patch_connect.add(
|
||||
Domain(domain="nodata.com", hostname="da1.example.com", username="admin", zone_data=None)
|
||||
Domain(
|
||||
domain="nodata.com",
|
||||
hostname="da1.example.com",
|
||||
username="admin",
|
||||
zone_data=None,
|
||||
)
|
||||
)
|
||||
patch_connect.commit()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user