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

Logout and redirect

merge-requests/30/head
Bob Mottram 2020-10-13 13:40:08 +01:00
parent 5cd15b9611
commit 57ecb7bcd3
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
daemon.py
View File

@ -522,6 +522,21 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('X-Robots-Tag', 'noindex') self.send_header('X-Robots-Tag', 'noindex')
self.end_headers() self.end_headers()
def _logout_redirect(self, redirect: str, cookie: str,
callingDomain: str) -> None:
if '://' not in redirect:
print('REDIRECT ERROR: redirect is not an absolute url ' +
redirect)
self.send_response(303)
self.send_header('Set-Cookie', 'epicyon=; SameSite=Strict')
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 _set_headers_base(self, fileFormat: str, length: int, cookie: str, def _set_headers_base(self, fileFormat: str, length: int, cookie: str,
callingDomain: str) -> None: callingDomain: str) -> None:
self.send_response(200) self.send_response(200)
@ -8339,25 +8354,27 @@ class PubServer(BaseHTTPRequestHandler):
msg = \ msg = \
htmlLogin(self.server.translate, htmlLogin(self.server.translate,
self.server.baseDir, False).encode('utf-8') self.server.baseDir, False).encode('utf-8')
self._logout_headers('text/html', len(msg), callingDomain)
self._write(msg)
else: else:
if callingDomain.endswith('.onion') and \ if callingDomain.endswith('.onion') and \
self.server.onionDomain: self.server.onionDomain:
self._redirect_headers('http://' + self._logout_redirect('http://' +
self.server.onionDomain + self.server.onionDomain +
'/users/news', None, '/users/news', None,
callingDomain) callingDomain)
elif (callingDomain.endswith('.i2p') and elif (callingDomain.endswith('.i2p') and
self.server.i2pDomain): self.server.i2pDomain):
self._redirect_headers('http://' + self._logout_redirect('http://' +
self.server.i2pDomain + self.server.i2pDomain +
'/users/news', None, '/users/news', None,
callingDomain) callingDomain)
else: else:
self._redirect_headers(self.server.httpPrefix + self._logout_redirect(self.server.httpPrefix +
'://' + '://' +
self.server.domainFull + self.server.domainFull +
'/users/news', '/users/news',
None, callingDomain) None, callingDomain)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'_nodeinfo(callingDomain)', '_nodeinfo(callingDomain)',
'logout') 'logout')