revi-archive/remail
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/tglx/remail.git synced 2024-11-25 13:52:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

remail/mail: Sanitize incoming headers

Browse source 
Remove CR/LF leftovers which might be in incoming headers before setting
them. Happens when handling the weird GPG Outlook attachments.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2019-11-12 23:44:24 +01:00
parent dac7c0af8d
commit 8ada1c09b3
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
remail/mail.py
View file

@ -197,11 +197,16 @@ def msg_force_msg_id(msg, name):
id = make_msgid(name.split('@')[0]) id = make_msgid(name.split('@')[0])
msg_set_header(msg, 'Message-ID', id) msg_set_header(msg, 'Message-ID', id)
re_rmlfcr = re.compile('[\r\n]')
def msg_set_header(msg, hdr, txt): def msg_set_header(msg, hdr, txt):
''' '''
Set new or replace a message header Set new or replace a message header
''' '''
# Sanitize the header first. Broken Outlook GPG payloads
# come with wreckaged headers.
txt = re_rmlfcr.sub(' ', txt)
for k in msg.keys(): for k in msg.keys():
if hdr.lower() == k.lower(): if hdr.lower() == k.lower():
msg.replace_header(k, txt) msg.replace_header(k, txt)