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

make test more readable

Browse Source
This commit is contained in:
holger krekel
2023-10-18 15:19:20 +02:00
parent 6dcd686701
commit c0673cc43f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
online-tests/test_0_basic.py
View File

@@ -19,25 +19,25 @@ def test_use_two_chatmailservers(cmfactory, maildomain2):
assert domain1 != domain2 assert domain1 != domain2
@pytest.mark.parametrize("internal", [True, False]) @pytest.mark.parametrize("forgeaddr", ["internal", "someone@example.org"])
def test_reject_forged_from(cmsetup, mailgen, lp, remote, internal): def test_reject_forged_from(cmsetup, mailgen, lp, remote, forgeaddr):
user1, user2, user3 = cmsetup.gen_users(3) user1, user3 = cmsetup.gen_users(2)
lp.sec("send encrypted message with forged from") lp.sec("send encrypted message with forged from")
print("envelope_from", user1.addr) print("envelope_from", user1.addr)
if internal: if forgeaddr == "internal":
user_to_forge = user2.addr addr_to_forge = cmsetup.gen_users(1)[0].addr
else: else:
user_to_forge = "someone@example.org" addr_to_forge = "someone@example.org"
print("message to inject:") print("message to inject:")
msg = mailgen.get_encrypted(from_addr=user_to_forge, to_addr=user3.addr) msg = mailgen.get_encrypted(from_addr=addr_to_forge, to_addr=user3.addr)
for line in msg.split("\n")[:4]: for line in msg.split("\n")[:4]:
print(f" {line}") print(f" {line}")
lp.sec("Send forged mail and check remote postfix lmtp processing result")
remote_log = remote.iter_output("journalctl -t postfix/lmtp") remote_log = remote.iter_output("journalctl -t postfix/lmtp")
user1.smtp.sendmail(from_addr=user1.addr, to_addrs=[user3.addr], msg=msg) user1.smtp.sendmail(from_addr=user1.addr, to_addrs=[user3.addr], msg=msg)
for line in remote_log: for line in remote_log:
# print(line) # print(line)
if "500 invalid from" in line and user3.addr in line: if "500 invalid from" in line and user3.addr in line:
@@ -45,8 +45,8 @@ def test_reject_forged_from(cmsetup, mailgen, lp, remote, internal):
else: else:
pytest.fail("remote postfix/filtermail failed to reject message") pytest.fail("remote postfix/filtermail failed to reject message")
# also check that the forging-user got a non-delivery notice # check that the logged in user (who sent the forged msg) got a non-delivery notice
for message in user1.imap.fetch_all_messages(): for message in user1.imap.fetch_all_messages():
if "Invalid FROM" in message and user_to_forge in message: if "Invalid FROM" in message and addr_to_forge in message:
return return
pytest.fail(f"forged From={user_to_forge} did not cause non-delivery notice") pytest.fail(f"forged From={addr_to_forge} did not cause non-delivery notice")