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

unquote

main
Bob Mottram 2020-04-15 11:57:04 +01:00
parent e8f4b35630
commit 167b7926fd
1 changed files with 27 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
daemon.py
View File

@ -10,6 +10,7 @@ from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
import json import json
import time import time
import locale import locale
import urllib.parse
from functools import partial from functools import partial
# for saving images # for saving images
from hashlib import sha256 from hashlib import sha256
@ -1315,9 +1316,7 @@ class PubServer(BaseHTTPRequestHandler):
# remove a shared item # remove a shared item
if htmlGET and '?rmshare=' in self.path: if htmlGET and '?rmshare=' in self.path:
shareName = self.path.split('?rmshare=')[1] shareName = self.path.split('?rmshare=')[1]
shareName = shareName.replace('%20', ' ').replace('%40', '@') shareName = urllib.parse.unquote(shareName.strip())
shareName = shareName.replace('%3A', ':').replace('%2F', '/')
shareName = shareName.replace('%23', '#').strip()
usersPath = self.path.split('?rmshare=')[0] usersPath = self.path.split('?rmshare=')[0]
actor = \ actor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -2724,11 +2723,8 @@ class PubServer(BaseHTTPRequestHandler):
if inReplyToUrl.startswith('sharedesc:'): if inReplyToUrl.startswith('sharedesc:'):
shareDescription = \ shareDescription = \
inReplyToUrl.replace('sharedesc:', '') inReplyToUrl.replace('sharedesc:', '')
shareDescription = shareDescription.replace('%20', ' ') shareDescription = \
shareDescription = shareDescription.replace('%40', '@') urllib.parse.unquote(shareDescription.strip())
shareDescription = shareDescription.replace('%3A', ':')
shareDescription = shareDescription.replace('%2F', '/')
shareDescription = shareDescription.replace('%23', '#')
self.path = self.path.split('?replydm=')[0]+'/newdm' self.path = self.path.split('?replydm=')[0]+'/newdm'
if self.server.debug: if self.server.debug:
print('DEBUG: replydm path ' + self.path) print('DEBUG: replydm path ' + self.path)
@ -5780,10 +5776,8 @@ class PubServer(BaseHTTPRequestHandler):
moderationText = \ moderationText = \
moderationStr.split('=')[1].strip() moderationStr.split('=')[1].strip()
moderationText = moderationText.replace('+', ' ') moderationText = moderationText.replace('+', ' ')
moderationText = moderationText.replace('%40', '@') moderationText = \
moderationText = moderationText.replace('%3A', ':') urllib.parse.unquote(moderationText.strip())
moderationText = moderationText.replace('%23', '#')
moderationText = moderationText.strip()
elif moderationStr.startswith('submitInfo'): elif moderationStr.startswith('submitInfo'):
msg = htmlModerationInfo(self.server.translate, msg = htmlModerationInfo(self.server.translate,
self.server.baseDir, self.server.baseDir,
@ -5928,11 +5922,9 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
questionParams = self.rfile.read(length).decode('utf-8') questionParams = self.rfile.read(length).decode('utf-8')
questionParams = questionParams.replace('+', ' ') questionParams = questionParams.replace('+', ' ')
questionParams = questionParams.replace('%40', '@') questionParams = questionParams.replace('%3F', '')
questionParams = questionParams.replace('%3A', ':') questionParams = \
questionParams = questionParams.replace('%23', '#') urllib.parse.unquote(questionParams.strip())
questionParams = questionParams.replace('%2F', '/')
questionParams = questionParams.replace('%3F', '').strip()
# post being voted on # post being voted on
messageId = None messageId = None
if 'messageId=' in questionParams: if 'messageId=' in questionParams:
@ -5989,11 +5981,9 @@ class PubServer(BaseHTTPRequestHandler):
searchStr = searchParams.split('searchtext=')[1] searchStr = searchParams.split('searchtext=')[1]
if '&' in searchStr: if '&' in searchStr:
searchStr = searchStr.split('&')[0] searchStr = searchStr.split('&')[0]
searchStr = searchStr.replace('+', ' ').replace('%20', ' ') searchStr = searchStr.replace('+', ' ')
searchStr = searchStr.replace('%40', '@').replace('%3A', ':') searchStr = \
searchStr = searchStr.replace('%2F', '/').replace('%23', '#') urllib.parse.unquote(searchStr.strip())
searchStr = searchStr.replace('%21', '!').replace('%2B', '+')
searchStr = searchStr.strip()
if self.server.debug: if self.server.debug:
print('searchStr: ' + searchStr) print('searchStr: ' + searchStr)
if searchForEmoji: if searchForEmoji:
@ -6161,18 +6151,10 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
removeShareConfirmParams = self.rfile.read(length).decode('utf-8') removeShareConfirmParams = self.rfile.read(length).decode('utf-8')
if '&submitYes=' in removeShareConfirmParams: if '&submitYes=' in removeShareConfirmParams:
removeShareConfirmParams = \
removeShareConfirmParams.replace('%20', ' ')
removeShareConfirmParams = \
removeShareConfirmParams.replace('%40', '@')
removeShareConfirmParams = \
removeShareConfirmParams.replace('%3A', ':')
removeShareConfirmParams = \
removeShareConfirmParams.replace('%2F', '/')
removeShareConfirmParams = \
removeShareConfirmParams.replace('%23', '#')
removeShareConfirmParams = \ removeShareConfirmParams = \
removeShareConfirmParams.replace('+', ' ').strip() removeShareConfirmParams.replace('+', ' ').strip()
removeShareConfirmParams = \
urllib.parse.unquote(removeShareConfirmParams)
shareActor = removeShareConfirmParams.split('actor=')[1] shareActor = removeShareConfirmParams.split('actor=')[1]
if '&' in shareActor: if '&' in shareActor:
shareActor = shareActor.split('&')[0] shareActor = shareActor.split('&')[0]
@ -6206,15 +6188,7 @@ class PubServer(BaseHTTPRequestHandler):
removePostConfirmParams = self.rfile.read(length).decode('utf-8') removePostConfirmParams = self.rfile.read(length).decode('utf-8')
if '&submitYes=' in removePostConfirmParams: if '&submitYes=' in removePostConfirmParams:
removePostConfirmParams = \ removePostConfirmParams = \
removePostConfirmParams.replace('%20', ' ') urllib.parse.unquote(removePostConfirmParams)
removePostConfirmParams = \
removePostConfirmParams.replace('%40', '@')
removePostConfirmParams = \
removePostConfirmParams.replace('%3A', ':')
removePostConfirmParams = \
removePostConfirmParams.replace('%2F', '/')
removePostConfirmParams = \
removePostConfirmParams.replace('%23', '#').strip()
removeMessageId = \ removeMessageId = \
removePostConfirmParams.split('messageId=')[1] removePostConfirmParams.split('messageId=')[1]
if '&' in removeMessageId: if '&' in removeMessageId:
@ -6284,8 +6258,8 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
followConfirmParams = self.rfile.read(length).decode('utf-8') followConfirmParams = self.rfile.read(length).decode('utf-8')
if '&submitView=' in followConfirmParams: if '&submitView=' in followConfirmParams:
followingActor = followConfirmParams.replace('%3A', ':') followingActor = \
followingActor = followingActor.replace('%2F', '/') urllib.parse.unquote(followConfirmParams)
followingActor = followingActor.split('actor=')[1] followingActor = followingActor.split('actor=')[1]
if '&' in followingActor: if '&' in followingActor:
followingActor = followingActor.split('&')[0] followingActor = followingActor.split('&')[0]
@ -6293,8 +6267,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy = False self.server.POSTbusy = False
return return
if '&submitYes=' in followConfirmParams: if '&submitYes=' in followConfirmParams:
followingActor = followConfirmParams.replace('%3A', ':') followingActor = \
followingActor = followingActor.replace('%2F', '/') urllib.parse.unquote(followConfirmParams)
followingActor = followingActor.split('actor=')[1] followingActor = followingActor.split('actor=')[1]
if '&' in followingActor: if '&' in followingActor:
followingActor = followingActor.split('&')[0] followingActor = followingActor.split('&')[0]
@ -6344,8 +6318,8 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
followConfirmParams = self.rfile.read(length).decode('utf-8') followConfirmParams = self.rfile.read(length).decode('utf-8')
if '&submitYes=' in followConfirmParams: if '&submitYes=' in followConfirmParams:
followingActor = followConfirmParams.replace('%3A', ':') followingActor = \
followingActor = followingActor.replace('%2F', '/') urllib.parse.unquote(followConfirmParams)
followingActor = followingActor.split('actor=')[1] followingActor = followingActor.split('actor=')[1]
if '&' in followingActor: if '&' in followingActor:
followingActor = followingActor.split('&')[0] followingActor = followingActor.split('&')[0]
@ -6412,8 +6386,8 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
blockConfirmParams = self.rfile.read(length).decode('utf-8') blockConfirmParams = self.rfile.read(length).decode('utf-8')
if '&submitYes=' in blockConfirmParams: if '&submitYes=' in blockConfirmParams:
blockingActor = blockConfirmParams.replace('%3A', ':') blockingActor = \
blockingActor = blockingActor.replace('%2F', '/') urllib.parse.unquote(blockConfirmParams)
blockingActor = blockingActor.split('actor=')[1] blockingActor = blockingActor.split('actor=')[1]
if '&' in blockingActor: if '&' in blockingActor:
blockingActor = blockingActor.split('&')[0] blockingActor = blockingActor.split('&')[0]
@ -6479,8 +6453,8 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
blockConfirmParams = self.rfile.read(length).decode('utf-8') blockConfirmParams = self.rfile.read(length).decode('utf-8')
if '&submitYes=' in blockConfirmParams: if '&submitYes=' in blockConfirmParams:
blockingActor = blockConfirmParams.replace('%3A', ':') blockingActor = \
blockingActor = blockingActor.replace('%2F', '/') urllib.parse.unquote(blockConfirmParams)
blockingActor = blockingActor.split('actor=')[1] blockingActor = blockingActor.split('actor=')[1]
if '&' in blockingActor: if '&' in blockingActor:
blockingActor = blockingActor.split('&')[0] blockingActor = blockingActor.split('&')[0]
@ -6547,8 +6521,8 @@ class PubServer(BaseHTTPRequestHandler):
return return
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
optionsConfirmParams = self.rfile.read(length).decode('utf-8') optionsConfirmParams = self.rfile.read(length).decode('utf-8')
optionsConfirmParams = optionsConfirmParams.replace('%3A', ':') optionsConfirmParams = \
optionsConfirmParams = optionsConfirmParams.replace('%2F', '/') urllib.parse.unquote(optionsConfirmParams)
# page number to return to # page number to return to
if 'pageNumber=' in optionsConfirmParams: if 'pageNumber=' in optionsConfirmParams:
pageNumberStr = optionsConfirmParams.split('pageNumber=')[1] pageNumberStr = optionsConfirmParams.split('pageNumber=')[1]