YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Bad DNS conf suggestion

Browse source
This commit is contained in:
ljf 2022-04-27 14:59:55 +02:00
parent 3f9fd91334
commit 19769d8348
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/diagnosers/12-dnsrecords.py
View file

@ -17,7 +17,11 @@ from yunohost.utils.dns import (
) )
from yunohost.diagnosis import Diagnoser from yunohost.diagnosis import Diagnoser
from yunohost.domain import domain_list, _get_maindomain from yunohost.domain import domain_list, _get_maindomain
from yunohost.dns import _build_dns_conf, _get_dns_zone_for_domain from yunohost.dns import (
_build_dns_conf,
_get_dns_zone_for_domain,
_get_relative_name_for_dns_zone
)
logger = log.getActionLogger("yunohost.diagnosis") logger = log.getActionLogger("yunohost.diagnosis")
@ -68,7 +72,7 @@ class MyDiagnoser(Diagnoser):
return return
base_dns_zone = _get_dns_zone_for_domain(domain) base_dns_zone = _get_dns_zone_for_domain(domain)
basename = domain.replace(base_dns_zone, "").rstrip(".") or "@" basename = _get_relative_name_for_dns_zone(domain, base_dns_zone)
expected_configuration = _build_dns_conf( expected_configuration = _build_dns_conf(
domain, include_empty_AAAA_if_no_ipv6=True domain, include_empty_AAAA_if_no_ipv6=True

30
src/dns.py
View file

@ -183,8 +183,7 @@ def _build_dns_conf(base_domain, include_empty_AAAA_if_no_ipv6=False):
# foo.sub.domain.tld # domain.tld # foo.sub # .foo.sub # # foo.sub.domain.tld # domain.tld # foo.sub # .foo.sub #
# sub.domain.tld # sub.domain.tld # @ # # # sub.domain.tld # sub.domain.tld # @ # #
# foo.sub.domain.tld # sub.domain.tld # foo # .foo # # foo.sub.domain.tld # sub.domain.tld # foo # .foo #
basename = _get_relative_name_for_dns_zone(domain, base_dns_zone)
basename = domain.replace(base_dns_zone, "").rstrip(".") or "@"
suffix = f".{basename}" if basename != "@" else "" suffix = f".{basename}" if basename != "@" else ""
# ttl = settings["ttl"] # ttl = settings["ttl"]
@ -467,10 +466,17 @@ def _get_dns_zone_for_domain(domain):
# Until we find the first one that has a NS record # Until we find the first one that has a NS record
parent_list = [domain.split(".", i)[-1] for i, _ in enumerate(domain.split("."))] parent_list = [domain.split(".", i)[-1] for i, _ in enumerate(domain.split("."))]
for parent in parent_list: # We don't wan't to do A NS request on the tld
for parent in parent_list[0:-1]:
# Check if there's a NS record for that domain # Check if there's a NS record for that domain
answer = dig(parent, rdtype="NS", full_answers=True, resolvers="force_external") answer = dig(parent, rdtype="NS", full_answers=True, resolvers="force_external")
if answer[0] != "ok":
# Some domains have a SOA configured but NO NS record !!!
# See https://github.com/YunoHost/issues/issues/1980
answer = dig(parent, rdtype="SOA", full_answers=True, resolvers="force_external")
if answer[0] == "ok": if answer[0] == "ok":
mkdir(cache_folder, parents=True, force=True) mkdir(cache_folder, parents=True, force=True)
write_to_file(cache_file, parent) write_to_file(cache_file, parent)
@ -482,11 +488,15 @@ def _get_dns_zone_for_domain(domain):
zone = parent_list[-1] zone = parent_list[-1]
logger.warning( logger.warning(
f"Could not identify the dns zone for domain {domain}, returning {zone}" f"Could not identify correctly the dns zone for domain {domain}, returning {zone}"
) )
return zone return zone
def _get_relative_name_for_dns_zone(domain, base_dns_zone):
return re.sub("\.?" + base_dns_zone.replace(".", "\.") + "$", "", domain.strip(".")) or "@"
def _get_registrar_config_section(domain): def _get_registrar_config_section(domain):
from lexicon.providers.auto import _relevant_provider_for_domain from lexicon.providers.auto import _relevant_provider_for_domain
@ -837,14 +847,10 @@ def domain_dns_push(operation_logger, domain, dry_run=False, force=False, purge=
for record in current: for record in current:
changes["delete"].append(record) changes["delete"].append(record)
def relative_name(name):
name = name.strip(".")
name = name.replace("." + base_dns_zone, "")
name = name.replace(base_dns_zone, "@")
return name
def human_readable_record(action, record): def human_readable_record(action, record):
name = relative_name(record["name"]) name = (record["name"])
name = _get_relative_name_for_dns_zone(record['name'], base_dns_zone)
name = name[:20] name = name[:20]
t = record["type"] t = record["type"]
@ -877,7 +883,7 @@ def domain_dns_push(operation_logger, domain, dry_run=False, force=False, purge=
if Moulinette.interface.type == "api": if Moulinette.interface.type == "api":
for records in changes.values(): for records in changes.values():
for record in records: for record in records:
record["name"] = relative_name(record["name"]) record["name"] = _get_relative_name_for_dns_zone(record["name"], base_dns_zone)
return changes return changes
else: else:
out = {"delete": [], "create": [], "update": [], "unchanged": []} out = {"delete": [], "create": [], "update": [], "unchanged": []}
@ -926,7 +932,7 @@ def domain_dns_push(operation_logger, domain, dry_run=False, force=False, purge=
for record in changes[action]: for record in changes[action]:
relative_name = record["name"].replace(base_dns_zone, "").rstrip(".") or "@" relative_name = _get_relative_name_for_dns_zone(record['name'], base_dns_zone)
progress( progress(
f"{action} {record['type']:^5} / {relative_name}" f"{action} {record['type']:^5} / {relative_name}"
) # FIXME: i18n but meh ) # FIXME: i18n but meh