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

oops

Browse source
This commit is contained in:
Tagadda 2022-10-24 21:55:05 +00:00 • committed by Tagada
parent f4b396219c
commit c4c78f5daa
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/diagnosers/10-ip.py
View file

@ -122,7 +122,7 @@ class MyDiagnoser(Diagnoser):
yield dict(
meta={"test": "ipv4"},
data={"global": ipv4, "local": get_local_ip("ipv4")},
status="SUCCESS" if ipv4 else "ERROR" if settings_get("dns_exposure") == "ipv4" else "WARNING",
status="SUCCESS" if ipv4 else "ERROR" if settings_get("misc.network.dns_exposure") == "ipv4" else "WARNING",
summary="diagnosis_ip_connected_ipv4" if ipv4 else "diagnosis_ip_no_ipv4",
details=["diagnosis_ip_global", "diagnosis_ip_local"] if ipv4 else None,
)
@ -130,7 +130,7 @@ class MyDiagnoser(Diagnoser):
yield dict(
meta={"test": "ipv6"},
data={"global": ipv6, "local": get_local_ip("ipv6")},
status="SUCCESS" if ipv6 else "ERROR" if settings_get("dns_exposure") == "ipv6" else "WARNING",
status="SUCCESS" if ipv6 else "ERROR" if settings_get("misc.network.dns_exposure") == "ipv6" else "WARNING",
summary="diagnosis_ip_connected_ipv6" if ipv6 else "diagnosis_ip_no_ipv6",
details=["diagnosis_ip_global", "diagnosis_ip_local"]
if ipv6

4
src/diagnosers/14-ports.py
View file

@ -47,7 +47,7 @@ class MyDiagnoser(Diagnoser):
ipversions = []
ipv4 = Diagnoser.get_cached_report("ip", item={"test": "ipv4"}) or {}
if ipv4.get("status") == "SUCCESS" or settings_get("dns_exposure") != "ipv6":
if ipv4.get("status") == "SUCCESS" or settings_get(misc.network.dns_exposure") != "ipv6":
ipversions.append(4)
# To be discussed: we could also make this check dependent on the
@ -121,7 +121,7 @@ class MyDiagnoser(Diagnoser):
for record in dnsrecords.get("items", [])
)
if failed == 4 and settings_get("dns_exposure") != "ipv6" or ipv6_is_important():
if failed == 4 and settings_get(misc.network.dns_exposure") != "ipv6" or ipv6_is_important():
yield dict(
meta={"port": port},
data={

8
src/diagnosers/21-web.py
View file

@ -77,7 +77,7 @@ class MyDiagnoser(Diagnoser):
ipversions = []
ipv4 = Diagnoser.get_cached_report("ip", item={"test": "ipv4"}) or {}
if ipv4.get("status") == "SUCCESS" and settings_get("dns_exposure") != "ipv6":
if ipv4.get("status") == "SUCCESS" and settings_get(misc.network.dns_exposure") != "ipv6":
ipversions.append(4)
# To be discussed: we could also make this check dependent on the
@ -97,7 +97,7 @@ class MyDiagnoser(Diagnoser):
# "curl --head the.global.ip" will simply timeout...
if self.do_hairpinning_test:
global_ipv4 = ipv4.get("data", {}).get("global", None)
if global_ipv4 and settings_get("dns_exposure") != "ipv6":
if global_ipv4 and settings_get(misc.network.dns_exposure") != "ipv6":
try:
requests.head("http://" + global_ipv4, timeout=5)
except requests.exceptions.Timeout:
@ -148,7 +148,7 @@ class MyDiagnoser(Diagnoser):
if all(
results[ipversion][domain]["status"] == "ok" for ipversion in ipversions
):
if 4 in ipversions and settings_get("dns_exposure") != "ipv6":
if 4 in ipversions and settings_get(misc.network.dns_exposure") != "ipv6":
self.do_hairpinning_test = True
yield dict(
meta={"domain": domain},
@ -186,7 +186,7 @@ class MyDiagnoser(Diagnoser):
)
AAAA_status = dnsrecords.get("data", {}).get("AAAA:@")
return AAAA_status in ["OK", "WRONG"] or settings_get("dns_exposure") != "ipv4"
return AAAA_status in ["OK", "WRONG"] or settings_get(misc.network.dns_exposure") != "ipv4"
if failed == 4 or ipv6_is_important_for_this_domain():
yield dict(

4
src/diagnosers/24-mail.py
View file

@ -302,13 +302,13 @@ class MyDiagnoser(Diagnoser):
outgoing_ipversions = []
outgoing_ips = []
ipv4 = Diagnoser.get_cached_report("ip", {"test": "ipv4"}) or {}
if ipv4.get("status") == "SUCCESS" and settings_get("dns_exposure") != "ipv6":
if ipv4.get("status") == "SUCCESS" and settings_get(misc.network.dns_exposure") != "ipv6":
outgoing_ipversions.append(4)
global_ipv4 = ipv4.get("data", {}).get("global", {})
if global_ipv4:
outgoing_ips.append(global_ipv4)
if settings_get("email.smtp.smtp_allow_ipv6") or settings_get("dns_exposure") != "ipv4":
if settings_get("email.smtp.smtp_allow_ipv6") or settings_get(misc.network.dns_exposure") != "ipv4":
ipv6 = Diagnoser.get_cached_report("ip", {"test": "ipv6"}) or {}
if ipv6.get("status") == "SUCCESS":
outgoing_ipversions.append(6)

4
src/dns.py
View file

@ -186,7 +186,7 @@ def _build_dns_conf(base_domain, include_empty_AAAA_if_no_ipv6=False):
###########################
# Basic ipv4/ipv6 records #
###########################
if ipv4 and settings_get("dns_exposure") != "ipv6":
if ipv4 and settings_get("misc.network.dns_exposure") != "ipv6":
basic.append([basename, ttl, "A", ipv4])
if ipv6:
@ -241,7 +241,7 @@ def _build_dns_conf(base_domain, include_empty_AAAA_if_no_ipv6=False):
# Only recommend wildcard and CAA for the top level
if domain == base_domain:
if ipv4 and settings_get("dns_exposure") != "ipv6":
if ipv4 and settings_get("misc.network.dns_exposure") != "ipv6":
extra.append([f"*{suffix}", ttl, "A", ipv4])
if ipv6: