cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-15 10:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

get tests working on IPv4 only machine

Browse Source
This commit is contained in:
missytake
2026-04-15 14:57:23 +02:00
committed by holger krekel
parent ace32bc15e
commit 8f2e757fad
7 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
chatmaild/src/chatmaild/config.py
View File

@@ -22,10 +22,7 @@ class Config:
self._inipath = inipath
self.mail_domain = params["mail_domain"]
self.mail_domain_hostname = format_arpa_address(params["mail_domain"])
if is_valid_ipv4(params["mail_domain"]):
self.mail_domain_deliverable = f"[{params['mail_domain']}]"
else:
self.mail_domain_deliverable = params["mail_domain"]
self.mail_domain_deliverable = format_deliverable_domain(params["mail_domain"])
self.max_user_send_per_minute = int(params.get("max_user_send_per_minute", 60))
self.max_user_send_burst_size = int(params.get("max_user_send_burst_size", 10))
self.max_mailbox_size = params["max_mailbox_size"]
@@ -198,3 +195,9 @@ def format_arpa_address(address: str) -> str:
if is_valid_ipv4(address):
return ipaddress.IPv4Address(address).reverse_pointer
return address
def format_deliverable_domain(mail_domain: str) -> str:
if is_valid_ipv4(mail_domain):
return f"[{mail_domain}]"
return mail_domain

2
chatmaild/src/chatmaild/tests/test_filtermail_blackbox.py
View File

@@ -74,7 +74,7 @@ def test_one_mail(
print(line.decode("ascii"), file=sys.stderr)
pytest.fail("starting filtermail failed")
addr = f"user1@{config.mail_domain}"
addr = f"user1@{config.mail_domain_deliverable}"
config.get_user(addr).set_password("l1k2j3l1k2j3l")
# send encrypted mail