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

Return public key as json

merge-requests/30/head
Bob Mottram 2022-08-27 21:28:44 +01:00
parent 173f75113f
commit 1b235f60ce
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.py
View File

@ -827,9 +827,7 @@ class PubServer(BaseHTTPRequestHandler):
return None return None
if not actor_json.get('publicKey'): if not actor_json.get('publicKey'):
return None return None
if not actor_json['publicKey'].get('publicKeyPem'): return actor_json['publicKey']
return None
return actor_json['publicKey']['publicKeyPem']
def _login_headers(self, file_format: str, length: int, def _login_headers(self, file_format: str, length: int,
calling_domain: str) -> None: calling_domain: str) -> None:
@ -15249,7 +15247,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
# getting the public key for an account # getting the public key for an account
acct_pub_key_str = \ 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.http_prefix,
@ -15257,10 +15255,12 @@ class PubServer(BaseHTTPRequestHandler):
self.server.onion_domain, self.server.onion_domain,
self.server.i2p_domain, self.server.i2p_domain,
calling_domain) calling_domain)
if acct_pub_key_str: if acct_pub_key_json:
msg = acct_pub_key_str.encode('utf-8') msg_str = json.dumps(acct_pub_key_json, ensure_ascii=False)
msg = msg_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._logout_headers('text/plain', msglen, calling_domain) self._set_headers('application/json',
msglen, None, calling_domain, False)
self._write(msg) self._write(msg)
return return