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] Diagnosis: reverse DNS check should be case-insensitive #2235

Browse source
This commit is contained in:
ljf (zamentur) 2023-08-25 03:23:33 +02:00 • committed by GitHub
parent b0fe49ae83
commit 0b05143745
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@ class MyDiagnoser(Diagnoser):
dependencies: List[str] = ["ip"] dependencies: List[str] = ["ip"]
def run(self): def run(self):
self.ehlo_domain = _get_maindomain() self.ehlo_domain = _get_maindomain().lower()
self.mail_domains = domain_list()["domains"] self.mail_domains = domain_list()["domains"]
self.ipversions, self.ips = self.get_ips_checked() self.ipversions, self.ips = self.get_ips_checked()
@ -132,7 +132,7 @@ class MyDiagnoser(Diagnoser):
summary=summary, summary=summary,
details=[summary + "_details"], details=[summary + "_details"],
) )
elif r["helo"] != self.ehlo_domain: elif r["helo"].lower() != self.ehlo_domain:
yield dict( yield dict(
meta={"test": "mail_ehlo", "ipversion": ipversion}, meta={"test": "mail_ehlo", "ipversion": ipversion},
data={"wrong_ehlo": r["helo"], "right_ehlo": self.ehlo_domain}, data={"wrong_ehlo": r["helo"], "right_ehlo": self.ehlo_domain},
@ -185,7 +185,7 @@ class MyDiagnoser(Diagnoser):
rdns_domain = "" rdns_domain = ""
if len(value) > 0: if len(value) > 0:
rdns_domain = value[0][:-1] if value[0].endswith(".") else value[0] rdns_domain = value[0][:-1] if value[0].endswith(".") else value[0]
if rdns_domain != self.ehlo_domain: if rdns_domain.lower() != self.ehlo_domain:
details = [ details = [
"diagnosis_mail_fcrdns_different_from_ehlo_domain_details" "diagnosis_mail_fcrdns_different_from_ehlo_domain_details"
] + details ] + details
@ -194,7 +194,7 @@ class MyDiagnoser(Diagnoser):
data={ data={
"ip": ip, "ip": ip,
"ehlo_domain": self.ehlo_domain, "ehlo_domain": self.ehlo_domain,
"rdns_domain": rdns_domain, "rdns_domain": rdns_domain.lower(),
}, },
status="ERROR", status="ERROR",
summary="diagnosis_mail_fcrdns_different_from_ehlo_domain", summary="diagnosis_mail_fcrdns_different_from_ehlo_domain",