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

Tidying

merge-requests/30/head
Bob Mottram 2023-10-02 10:44:32 +01:00
parent ff3ce91eac
commit a45a289e62
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
daemon.py
View File

@ -981,9 +981,7 @@ class PubServer(BaseHTTPRequestHandler):
return False return False
def _get_account_pub_key(self, path: str, person_cache: {}, def _get_account_pub_key(self, path: str, person_cache: {},
base_dir: str, http_prefix: str, base_dir: str, domain: str,
domain: str, onion_domain: str,
i2p_domain: str,
calling_domain: str) -> str: calling_domain: str) -> str:
"""Returns the public key for an account """Returns the public key for an account
""" """
@ -1049,8 +1047,7 @@ class PubServer(BaseHTTPRequestHandler):
return redirect.replace('/' + last_str, '/' + return redirect.replace('/' + last_str, '/' +
urllib.parse.quote_plus(last_str)) urllib.parse.quote_plus(last_str))
def _logout_redirect(self, redirect: str, cookie: str, def _logout_redirect(self, redirect: str, calling_domain: str) -> None:
calling_domain: str) -> None:
if '://' not in redirect: if '://' not in redirect:
redirect = self._get_instance_url(calling_domain) + redirect redirect = self._get_instance_url(calling_domain) + redirect
print('WARN: redirect was not an absolute url, changed to ' + print('WARN: redirect was not an absolute url, changed to ' +
@ -17154,11 +17151,7 @@ class PubServer(BaseHTTPRequestHandler):
acct_pub_key_json = \ acct_pub_key_json = \
self._get_account_pub_key(self.path, self.server.person_cache, self._get_account_pub_key(self.path, self.server.person_cache,
self.server.base_dir, self.server.base_dir,
self.server.http_prefix, self.server.domain, calling_domain)
self.server.domain,
self.server.onion_domain,
self.server.i2p_domain,
calling_domain)
if acct_pub_key_json: if acct_pub_key_json:
msg_str = json.dumps(acct_pub_key_json, ensure_ascii=False) msg_str = json.dumps(acct_pub_key_json, ensure_ascii=False)
msg = msg_str.encode('utf-8') msg = msg_str.encode('utf-8')
@ -17262,7 +17255,7 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
news_url = \ news_url = \
self._get_instance_url(calling_domain) + '/users/news' self._get_instance_url(calling_domain) + '/users/news'
self._logout_redirect(news_url, None, calling_domain) self._logout_redirect(news_url, calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,
'_GET', 'logout', '_GET', 'logout',
self.server.debug) self.server.debug)
@ -19380,7 +19373,7 @@ class PubServer(BaseHTTPRequestHandler):
not authorized and \ not authorized and \
self.server.news_instance: self.server.news_instance:
news_url = self._get_instance_url(calling_domain) + '/users/news' news_url = self._get_instance_url(calling_domain) + '/users/news'
self._logout_redirect(news_url, None, calling_domain) self._logout_redirect(news_url, calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,
'_GET', 'news front page shown', '_GET', 'news front page shown',
self.server.debug) self.server.debug)