mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Search strings

master
Bob Mottram 2019-08-30 18:16:01 +01:00
parent 425ffd84e2
commit ef53f79fca
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.py
View File

@ -1831,8 +1831,20 @@ class PubServer(BaseHTTPRequestHandler):
} }
for mType,extensionList in mediaTypes.items(): for mType,extensionList in mediaTypes.items():
for extension in extensionList: for extension in extensionList:
searchStr='Content-Type: '+mType+'/'+extension searchStr=b'Content-Type: image/png'
imageLocation=postBytes.find(searchStr.encode('utf-8')) if extension=='jpeg':
searchStr=b'Content-Type: image/jpeg'
elif extension=='gif':
searchStr=b'Content-Type: image/gif'
elif extension=='mp4':
searchStr=b'Content-Type: video/mp4'
elif extension=='ogv':
searchStr=b'Content-Type: video/ogv'
elif extension=='mp3':
searchStr=b'Content-Type: audio/mp3'
elif extension=='ogg':
searchStr=b'Content-Type: audio/ogg'
imageLocation=postBytes.find(searchStr)
filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload' filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload'
if imageLocation>-1: if imageLocation>-1:
if extension=='jpeg': if extension=='jpeg':
@ -1843,7 +1855,7 @@ class PubServer(BaseHTTPRequestHandler):
if filename and imageLocation>-1: if filename and imageLocation>-1:
# locate the beginning of the image, after any # locate the beginning of the image, after any
# carriage returns # carriage returns
startPos=imageLocation+len(searchStr.encode('utf-8')) startPos=imageLocation+len(searchStr)
for offset in range(1,8): for offset in range(1,8):
if postBytes[startPos+offset]!=10: if postBytes[startPos+offset]!=10:
if postBytes[startPos+offset]!=13: if postBytes[startPos+offset]!=13: