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

Try redirect without redirecting

main
Bob Mottram 2020-06-19 11:47:25 +01:00
parent 8c1f56e42b
commit c608bd443b
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
daemon.py
View File

@ -525,23 +525,40 @@ class PubServer(BaseHTTPRequestHandler):
return False return False
def _redirect_headers(self, redirect: str, cookie: str, def _redirect_headers(self, redirect: str, cookie: str,
callingDomain: str) -> None: callingDomain: str, httpRedirect=False) -> None:
self.send_response(303)
if cookie:
if not cookie.startswith('SET:'):
self.send_header('Cookie', cookie)
else:
self.send_header('Set-Cookie',
cookie.replace('SET:', '').strip())
if '://' not in redirect: if '://' not in redirect:
print('REDIRECT ERROR: redirect is not an absolute url ' + print('REDIRECT ERROR: redirect is not an absolute url ' +
redirect) redirect)
self.send_header('Location', redirect)
self.send_header('Host', callingDomain) if not httpRedirect:
self.send_header('InstanceID', self.server.instanceId) self.headers = []
self.send_header('Content-Length', '0') if cookie:
self.send_header('X-Robots-Tag', 'noindex') if not cookie.startswith('SET:'):
self.end_headers() self.headers['Cookie'] = cookie
else:
self.send_header('Set-Cookie', cookie)
self.Path = redirect.replace(callingDomain, '')
print('Redirect path: ' + self.Path)
self.headers['Location'] = redirect
self.headers['Host'] = callingDomain
self.headers['InstanceID'] = self.server.instanceId
self.headers['Content-Length'] = '0'
self.headers['X-Robots-Tag'] = 'noindex'
self.do_GET()
else:
self.send_response(303)
if cookie:
if not cookie.startswith('SET:'):
self.send_header('Cookie', cookie)
else:
self.send_header('Set-Cookie',
cookie.replace('SET:', '').strip())
self.send_header('Location', redirect)
self.send_header('Host', callingDomain)
self.send_header('InstanceID', self.server.instanceId)
self.send_header('Content-Length', '0')
self.send_header('X-Robots-Tag', 'noindex')
self.end_headers()
def _httpReturnCode(self, httpCode: int, httpDescription: str) -> None: def _httpReturnCode(self, httpCode: int, httpDescription: str) -> None:
msg = "<html><head></head><body><h1>" + str(httpCode) + " " + \ msg = "<html><head></head><body><h1>" + str(httpCode) + " " + \