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

Logging in on onion domain

merge-requests/30/head
Bob Mottram 2020-03-27 13:19:50 +00:00
parent b8b0d962e2
commit 76c66b16bc
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.py
View File

@ -627,7 +627,8 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: WEBFINGER host-meta') print('DEBUG: WEBFINGER host-meta')
if self.path.startswith('/.well-known/host-meta'): if self.path.startswith('/.well-known/host-meta'):
if not callingDomain.endswith('.onion'): if not callingDomain.endswith('.onion') or \
not self.server.onionDomain:
wfResult= \ wfResult= \
webfingerMeta(self.server.httpPrefix, \ webfingerMeta(self.server.httpPrefix, \
self.server.domainFull) self.server.domainFull)
@ -642,7 +643,8 @@ class PubServer(BaseHTTPRequestHandler):
self._404() self._404()
return True return True
if self.path.startswith('/.well-known/nodeinfo'): if self.path.startswith('/.well-known/nodeinfo'):
if not callingDomain.endswith('.onion'): if not callingDomain.endswith('.onion') or \
not self.server.onionDomain:
wfResult= \ wfResult= \
webfingerNodeInfo(self.server.httpPrefix, \ webfingerNodeInfo(self.server.httpPrefix, \
self.server.domainFull) self.server.domainFull)
@ -1274,9 +1276,15 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: authorized='+str(authorized)) print('DEBUG: authorized='+str(authorized))
print('DEBUG: path='+self.path) print('DEBUG: path='+self.path)
self.send_response(303) self.send_response(303)
self.send_header('Location', \ if not callingDomain.endswith('.onion') or \
self.server.httpPrefix+'://'+ \ not self.server.onionDomain:
self.server.domainFull+'/login') self.send_header('Location', \
self.server.httpPrefix+'://'+ \
self.server.domainFull+'/login')
else:
self.send_header('Location', \
'http://'+ \
self.server.onionDomain+'/login')
self.send_header('Content-Length', '0') self.send_header('Content-Length', '0')
self.send_header('X-Robots-Tag','noindex') self.send_header('X-Robots-Tag','noindex')
self.end_headers() self.end_headers()