cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-11 16:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

get delivery working

Browse Source
This commit is contained in:
missytake
2026-04-15 12:39:28 +02:00
parent 69c5de4503
commit 92d3efb2f1
8 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,9 @@ class Config:
self.tls_key_path = f"/var/lib/acme/live/{self.mail_domain}/privkey"
# deprecated option
mbdir = params.get("mailboxes_dir", f"/home/vmail/mail/{self.mail_domain}")
mbdir = params.get(
"mailboxes_dir", f"/home/vmail/mail/{self.mail_domain_deliverable}"
)
self.mailboxes_dir = Path(mbdir.strip())
# old unused option (except for first migration from sqlite to maildir store)

4
chatmaild/src/chatmaild/doveauth.py
View File

@@ -108,7 +108,7 @@ class AuthDictProxy(DictProxy):
if namespace == "shared":
if type == "userdb":
user = args[0]
if user.endswith(f"@{config.mail_domain}"):
if user.endswith(f"@{config.mail_domain_deliverable}"):
res = self.lookup_userdb(user)
if res:
reply_command = "O"
@@ -116,7 +116,7 @@ class AuthDictProxy(DictProxy):
reply_command = "N"
elif type == "passdb":
user = args[1]
if user.endswith(f"@{config.mail_domain}"):
if user.endswith(f"@{config.mail_domain_deliverable}"):
res = self.lookup_passdb(user, cleartext_password=args[0])
if res:
reply_command = "O"

1
chatmaild/src/chatmaild/tests/test_config.py
View File

@@ -13,6 +13,7 @@ def test_read_config_basic(example_config):
example_config = read_config(inipath)
assert example_config.max_user_send_per_minute == 37
assert example_config.mail_domain == "chat.example.org"
assert example_config.mail_domain_deliverable == "chat.example.org"
def test_read_config_basic_using_defaults(tmp_path, maildomain):

20
chatmaild/src/chatmaild/tests/test_doveauth.py
View File

@@ -44,12 +44,20 @@ def test_invalid_username_length(example_config):
config.username_min_length = 6
config.username_max_length = 10
password = create_newemail_dict(config)["password"]
assert not is_allowed_to_create(config, f"a1234@{config.mail_domain}", password)
assert is_allowed_to_create(config, f"012345@{config.mail_domain}", password)
assert is_allowed_to_create(config, f"0123456@{config.mail_domain}", password)
assert is_allowed_to_create(config, f"0123456789@{config.mail_domain}", password)
assert not is_allowed_to_create(
config, f"0123456789x@{config.mail_domain}", password
config, f"a1234@{config.mail_domain_deliverable}", password
)
assert is_allowed_to_create(
config, f"012345@{config.mail_domain_deliverable}", password
)
assert is_allowed_to_create(
config, f"0123456@{config.mail_domain_deliverable}", password
)
assert is_allowed_to_create(
config, f"0123456789@{config.mail_domain_deliverable}", password
)
assert not is_allowed_to_create(
config, f"0123456789x@{config.mail_domain_deliverable}", password
)
@@ -124,7 +132,7 @@ def test_invalid_localpart_characters(make_config):
"""Test that is_allowed_to_create rejects localparts with invalid characters."""
config = make_config("chat.example.org", {"username_min_length": "3"})
password = "zequ0Aimuchoodaechik"
domain = config.mail_domain
domain = config.mail_domain_deliverable
# valid localparts
assert is_allowed_to_create(config, f"abc123@{domain}", password)

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

@@ -56,7 +56,7 @@ def test_print_new_account(capsys, monkeypatch, maildomain, tmpdir, example_conf
assert lines[0] == "Content-Type: application/json"
assert not lines[1]
dic = json.loads(lines[2])
assert dic["email"].endswith(f"@{example_config.mail_domain}")
assert dic["email"].endswith(f"@{example_config.mail_domain_deliverable}")
assert len(dic["password"]) >= 10
# default tls_cert=acme should not include dclogin_url
assert "dclogin_url" not in dic

7
cmdeploy/src/cmdeploy/deployers.py
View File

@@ -482,7 +482,7 @@ class ChatmailDeployer(Deployer):
def __init__(self, config):
self.config = config
self.mail_domain = config.mail_domain
self.mail_domain_deliverable = config.mail_domain_deliverable
def install(self):
files.put(
@@ -522,7 +522,7 @@ class ChatmailDeployer(Deployer):
server.shell(
name="Setup /etc/mailname",
commands=[
f"echo {self.mail_domain} >/etc/mailname; chmod 644 /etc/mailname"
f"echo {self.mail_domain_deliverable} >/etc/mailname; chmod 644 /etc/mailname"
],
)
@@ -585,6 +585,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool, website_only: bool) -
config = read_config(config_path)
check_config(config)
mail_domain = config.mail_domain
mail_domain_deliverable = config.mail_domain_deliverable
if website_only:
Deployment().perform_stages([WebsiteDeployer(config)])
@@ -649,7 +650,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool, website_only: bool) -
WebsiteDeployer(config),
ChatmailVenvDeployer(config),
MtastsDeployer(),
OpendkimDeployer(mail_domain),
OpendkimDeployer(mail_domain_deliverable),
# Dovecot should be started before Postfix
# because it creates authentication socket
# required by Postfix.

2
cmdeploy/src/cmdeploy/dovecot/dovecot.conf.j2
View File

@@ -40,7 +40,7 @@ service imap {
process_limit = 50000
}
mail_server_admin = mailto:root@{{ config.mail_domain }}
mail_server_admin = mailto:root@{{ config.mail_domain_deliverable }}
mail_server_comment = Chatmail server
# `zlib` enables compressing messages stored in the maildir.

6
cmdeploy/src/cmdeploy/opendkim/deployer.py
View File

@@ -12,8 +12,8 @@ from cmdeploy.basedeploy import Deployer, get_resource
class OpendkimDeployer(Deployer):
required_users = [("opendkim", None, ["opendkim"])]
def __init__(self, mail_domain):
self.mail_domain = mail_domain
def __init__(self, mail_domain_deliverable):
self.mail_domain_deliverable = mail_domain_deliverable
def install(self):
apt.packages(
@@ -22,7 +22,7 @@ class OpendkimDeployer(Deployer):
)
def configure(self):
domain = self.mail_domain
domain = self.mail_domain_deliverable
dkim_selector = "opendkim"
"""Configures OpenDKIM"""
need_restart = False