cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-19 12:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply code review and also catch "." as username

Browse Source
This commit is contained in:
holger krekel
2024-07-09 18:46:37 +02:00
parent a1f0a3e23b
commit 0d593c22d1
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,9 +38,11 @@ class Config:
return open(self._inipath, "rb") return open(self._inipath, "rb")
def get_user_maildir(self, addr): def get_user_maildir(self, addr):
if not addr or "/" in addr: if addr and addr != "." and "/" not in addr:
raise ValueError(addr) res = self.mail_basedir.joinpath(addr).resolve()
return self.mail_basedir.joinpath(addr) if res.is_relative_to(self.mail_basedir):
return res
raise ValueError(f"invalid address {addr!r}")
def write_initial_config(inipath, mail_domain): def write_initial_config(inipath, mail_domain):

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

@@ -43,7 +43,15 @@ def test_get_user_maildir(make_config):
with pytest.raises(ValueError): with pytest.raises(ValueError):
config.get_user_maildir("") config.get_user_maildir("")
with pytest.raises(ValueError): with pytest.raises(ValueError):
config.get_user_maildir(None) config.get_user_maildir(None)
with pytest.raises(ValueError): with pytest.raises(ValueError):
config.get_user_maildir("../some@something.testrun.org") config.get_user_maildir("../some@something.testrun.org")
with pytest.raises(ValueError):
config.get_user_maildir("..")
with pytest.raises(ValueError):
config.get_user_maildir(".")