tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding re.DOTALL to catch potentially folded lines and fixed formatting

Browse Source
This commit is contained in:
Joseph Ishac 2021-04-14 17:08:16 -04:00
parent a4532294ae
commit 84b96e1daa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
offlineimap/folder/Maildir.py
View File

@ -243,13 +243,14 @@ class MaildirFolder(BaseFolder):
# quoted boundaries. # quoted boundaries.
try: boundary_field = \ try: boundary_field = \
re.search(b"content-type:.*(boundary=[\"]?[A-Za-z0-9'()+_,-./:=? ]+[\"]?)", re.search(b"content-type:.*(boundary=[\"]?[A-Za-z0-9'()+_,-./:=? ]+[\"]?)",
re.split(b'[\r]?\n[\r]?\n',raw_msg_bytes)[0],re.IGNORECASE).group(1) re.split(b'[\r]?\n[\r]?\n', raw_msg_bytes)[0],
(re.IGNORECASE|re.DOTALL)).group(1)
except AttributeError: except AttributeError:
# No match # No match
return raw_msg_bytes return raw_msg_bytes
# get the boundary field, and strip off any trailing ws (against RFC rules, leading ws is OK) # get the boundary field, and strip off any trailing ws (against RFC rules, leading ws is OK)
# if it was already quoted, well then there was nothing to fix # if it was already quoted, well then there was nothing to fix
boundary, value = boundary_field.split(b'=',1) boundary, value = boundary_field.split(b'=', 1)
value = value.rstrip() value = value.rstrip()
# ord(b'"') == 34 # ord(b'"') == 34
if value[0] == value[-1] == 34: if value[0] == value[-1] == 34:
@ -260,8 +261,8 @@ class MaildirFolder(BaseFolder):
# boundary="ahahah " as the email library will trim the ws for us # boundary="ahahah " as the email library will trim the ws for us
return raw_msg_bytes return raw_msg_bytes
else: else:
new_field = b''.join([boundary,b'="',value,b'"']) new_field = b''.join([boundary, b'="', value, b'"'])
return(raw_msg_bytes.replace(boundary_field,new_field,1)) return(raw_msg_bytes.replace(boundary_field, new_field, 1))
# Interface from BaseFolder # Interface from BaseFolder