indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

main2
Bob Mottram 2019-11-09 21:34:24 +00:00
parent 9ccdebf3b0
commit bdf8351173
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon.py
View File

@ -2653,21 +2653,18 @@ class PubServer(BaseHTTPRequestHandler):
# why don't we just use msg.is_multipart(), rather than splitting? # why don't we just use msg.is_multipart(), rather than splitting?
# TL;DR it doesn't work for this use case because we're not using # TL;DR it doesn't work for this use case because we're not using
# email style encoding message/rfc822 # email style encoding message/rfc822
print('messageFields1: '+str(msg.get_payload(decode=False)))
print('messageFields2: '+str(msg.get_payload(decode=True)))
imageBoundary=b'Content-Disposition: form-data; name="attachpic";' imageBoundary=b'Content-Disposition: form-data; name="attachpic";'
imageLocation=postBytes.find(imageBoundary) imageLocation=postBytes.find(imageBoundary)
print('messageFields3: '+str(imageLocation))
if imageLocation>-1: if imageLocation>-1:
print('messageFields4') # get the first part of the data containing text fields
# If we try to use decode=True on the full data, including images,
# then it will fail
msg = email.parser.BytesParser().parsebytes(postBytes[:imageLocation]) msg = email.parser.BytesParser().parsebytes(postBytes[:imageLocation])
print('messageFields5')
messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary) messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary)
print('messageFields6')
print('messageFields7: '+str(messageFields))
fields={} fields={}
filename=None filename=None
attachmentMediaType=None attachmentMediaType=None
# get the text fields
for f in messageFields: for f in messageFields:
if f=='--': if f=='--':
continue continue
@ -2686,6 +2683,7 @@ class PubServer(BaseHTTPRequestHandler):
postValue+='\n' postValue+='\n'
postValue+=postLines[line] postValue+=postLines[line]
fields[postKey]=postValue fields[postKey]=postValue
# now extract any attached image or other media
if imageLocation>-1: if imageLocation>-1:
imageLocation2=-1 imageLocation2=-1
filename=None filename=None