Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial parse of rpamd extra headers

This commit is contained in:
Adrià Casajús 2022-03-17 19:03:36 +01:00
parent 0931642d11
commit e8013f8e0c
No known key found for this signature in database
GPG Key ID: F0033226A5AFC9B9
7 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/email/headers.py
View File

@ -12,6 +12,7 @@ CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding"
MIME_VERSION = "Mime-Version"
REPLY_TO = "Reply-To"
RECEIVED = "Received"
RSPAM_QUEUE_ID = "X-Rspamd-Queue-Id"
CC = "Cc"
DKIM_SIGNATURE = "DKIM-Signature"
X_SPAM_STATUS = "X-Spam-Status"

5
app/email_utils.py
View File

@ -1369,6 +1369,11 @@ def sl_sendmail(
def get_queue_id(msg: Message) -> Optional[str]:
"""Get the Postfix queue-id from a message"""
header_values = msg.get_all(headers.RSPAM_QUEUE_ID)
if header_values:
#Get last in case somebody tries to inject a header
return header_values[-1]
received_header = str(msg[headers.RECEIVED])
if not received_header:
return

42
tests/example_emls/double_queue_id_header.eml Normal file
View File

@ -0,0 +1,42 @@
X-SimpleLogin-Client-IP: 54.39.200.130
Received-SPF: Softfail (mailfrom) identity=mailfrom; client-ip=34.59.200.130;
helo=relay.somewhere.net; envelope-from=everwaste@gmail.com;
receiver=<UNKNOWN>
Received: from relay.somewhere.net (relay.somewhere.net [34.59.200.130])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.sldev.ovh (Postfix) with ESMTPS id 6D8C13F069
for <wehrman_mannequin@sldev.ovh>; Thu, 17 Mar 2022 16:50:20 +0000 (UTC)
Date: Thu, 17 Mar 2022 16:50:18 +0000
To: wehrman_mannequin@sldev.ovh
From: spoofedemailsource@gmail.com
Subject: test Thu, 17 Mar 2022 16:50:18 +0000
Message-Id: <20220317165018.000191@somewhere-5488dd4b6b-7crp6>
X-Mailer: swaks v20201014.0 jetmore.org/john/code/swaks/
X-Rspamd-Queue-Id: INVALIDVALUE
X-Rspamd-Queue-Id: 6D8C13F069
X-Rspamd-Server: staging1
X-Spamd-Result: default: False [0.50 / 13.00];
MID_RHS_NOT_FQDN(0.50)[];
DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none];
MIME_GOOD(-0.10)[text/plain];
MIME_TRACE(0.00)[0:+];
FROM_EQ_ENVFROM(0.00)[];
ASN(0.00)[asn:16276, ipnet:34.59.0.0/16, country:FR];
R_DKIM_NA(0.00)[];
RCVD_COUNT_ZERO(0.00)[0];
FREEMAIL_ENVFROM(0.00)[gmail.com];
FROM_NO_DN(0.00)[];
R_SPF_SOFTFAIL(0.00)[~all];
FORCE_ACTION_SL_SPF_FAIL_ADD_HEADER(0.00)[add header];
RCPT_COUNT_ONE(0.00)[1];
FREEMAIL_FROM(0.00)[gmail.com];
TO_DN_NONE(0.00)[];
TO_MATCH_ENVRCPT_ALL(0.00)[];
ARC_NA(0.00)[]
X-Rspamd-Pre-Result: action=add header;
module=force_actions;
unknown reason
X-Spam: Yes
This is a test mailing

41
tests/example_emls/gmail_spoof.eml Normal file
View File

@ -0,0 +1,41 @@
X-SimpleLogin-Client-IP: 54.39.200.130
Received-SPF: Softfail (mailfrom) identity=mailfrom; client-ip=34.59.200.130;
helo=relay.somewhere.net; envelope-from=everwaste@gmail.com;
receiver=<UNKNOWN>
Received: from relay.somewhere.net (relay.somewhere.net [34.59.200.130])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.sldev.ovh (Postfix) with ESMTPS id 6D8C13F069
for <wehrman_mannequin@sldev.ovh>; Thu, 17 Mar 2022 16:50:20 +0000 (UTC)
Date: Thu, 17 Mar 2022 16:50:18 +0000
To: wehrman_mannequin@sldev.ovh
From: spoofedemailsource@gmail.com
Subject: test Thu, 17 Mar 2022 16:50:18 +0000
Message-Id: <20220317165018.000191@somewhere-5488dd4b6b-7crp6>
X-Mailer: swaks v20201014.0 jetmore.org/john/code/swaks/
X-Rspamd-Queue-Id: 6D8C13F069
X-Rspamd-Server: staging1
X-Spamd-Result: default: False [0.50 / 13.00];
MID_RHS_NOT_FQDN(0.50)[];
DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none];
MIME_GOOD(-0.10)[text/plain];
MIME_TRACE(0.00)[0:+];
FROM_EQ_ENVFROM(0.00)[];
ASN(0.00)[asn:16276, ipnet:34.59.0.0/16, country:FR];
R_DKIM_NA(0.00)[];
RCVD_COUNT_ZERO(0.00)[0];
FREEMAIL_ENVFROM(0.00)[gmail.com];
FROM_NO_DN(0.00)[];
R_SPF_SOFTFAIL(0.00)[~all];
FORCE_ACTION_SL_SPF_FAIL_ADD_HEADER(0.00)[add header];
RCPT_COUNT_ONE(0.00)[1];
FREEMAIL_FROM(0.00)[gmail.com];
TO_DN_NONE(0.00)[];
TO_MATCH_ENVRCPT_ALL(0.00)[];
ARC_NA(0.00)[]
X-Rspamd-Pre-Result: action=add header;
module=force_actions;
unknown reason
X-Spam: Yes
This is a test mailing

11
tests/test_email_handler.py
View File

@ -1,3 +1,5 @@
import email
import os.path
from email.message import EmailMessage
from app.email import headers
@ -7,6 +9,7 @@ from email_handler import (
should_ignore,
is_automatic_out_of_office,
)
from tests.utils import load_eml_file
def test_get_mailbox_from_mail_from(flask_client):
@ -61,3 +64,11 @@ def test_is_automatic_out_of_office():
msg[headers.AUTO_SUBMITTED] = "auto-generated"
assert is_automatic_out_of_office(msg)
def test_process_spoofed():
msg = load_eml_file("gmail_spoof.eml")
breakpoint()
a = msg['a']
b=1
c=2

5
tests/test_email_utils.py
View File

@ -48,7 +48,7 @@ from app.models import (
)
# flake8: noqa: E101, W191
from tests.utils import login
from tests.utils import login, load_eml_file
def test_get_email_domain_part():
@ -747,6 +747,9 @@ def test_get_queue_id():
assert get_queue_id(msg) == "4FxQmw1DXdz2vK2"
def test_get_queue_id_from_double_header():
msg = load_eml_file("double_queue_id_header.eml")
assert get_queue_id(msg) == "6D8C13F069"
def test_should_ignore_bounce(flask_client):
assert not should_ignore_bounce("not-exist")

9
tests/utils.py
View File

@ -1,4 +1,7 @@
import email
import json
import os
from email.message import EmailMessage
from flask import url_for
@ -41,3 +44,9 @@ def create_user(flask_client) -> User:
def pretty(d):
"""pretty print as json"""
print(json.dumps(d, indent=2))
def load_eml_file(filename: str) -> EmailMessage:
emails_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)),"example_emls")
fullpath = os.path.join(emails_dir, filename)
return email.message_from_file(open(fullpath))