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

Upload multiple keys

merge-requests/8/head
Bob Mottram 2020-08-11 12:57:34 +00:00
parent b4071629e0
commit ea80dbb496
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
daemon.py
View File

@ -5824,20 +5824,43 @@ class PubServer(BaseHTTPRequestHandler):
if not deviceKeys:
self._400()
return
if not E2EEvalidDevice(deviceKeys):
self._400()
if isinstance(deviceKeys, list):
keyCtr = 0
for devKey in deviceKeys:
if not E2EEvalidDevice(devKey):
continue
E2EEaddDevice(self.server.baseDir,
self.authorizedNickname,
self.server.domain,
devKey['deviceId'],
devKey['name'],
devKey['claim'],
devKey['fingerprintKey']['publicKeyBase64'],
devKey['identityKey']['publicKeyBase64'],
devKey['fingerprintKey']['type'],
devKey['identityKey']['type'])
keyCtr += 1
if keyCtr > 10:
break
self._200()
return
E2EEaddDevice(self.server.baseDir,
self.authorizedNickname,
self.server.domain,
deviceKeys['deviceId'],
deviceKeys['name'],
deviceKeys['claim'],
deviceKeys['fingerprintKey']['publicKeyBase64'],
deviceKeys['identityKey']['publicKeyBase64'],
deviceKeys['fingerprintKey']['type'],
deviceKeys['identityKey']['type'])
self._200()
elif isinstance(deviceKeys, dict):
if not E2EEvalidDevice(deviceKeys):
self._400()
return
E2EEaddDevice(self.server.baseDir,
self.authorizedNickname,
self.server.domain,
deviceKeys['deviceId'],
deviceKeys['name'],
deviceKeys['claim'],
deviceKeys['fingerprintKey']['publicKeyBase64'],
deviceKeys['identityKey']['publicKeyBase64'],
deviceKeys['fingerprintKey']['type'],
deviceKeys['identityKey']['type'])
self._200()
return
self._400()
elif path.startswith('/api/v1/crypto/keys/query'):
# TODO
self._200()