From fedbe18ad27c011b3540a4829c3d3ae9b9b420fa Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 11 Aug 2020 18:21:56 +0100 Subject: [PATCH] Register one device at a time --- daemon.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/daemon.py b/daemon.py index 736d57f5..ad9b6756 100644 --- a/daemon.py +++ b/daemon.py @@ -5888,6 +5888,7 @@ class PubServer(BaseHTTPRequestHandler): """POST or GET with the crypto API """ if authorized and path.startswith('/api/v1/crypto/keys/upload'): + # register a device to an authorized account if not self.authorizedNickname: self._400() return @@ -5895,27 +5896,7 @@ class PubServer(BaseHTTPRequestHandler): if not deviceKeys: self._400() return - 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 - elif isinstance(deviceKeys, dict): + if isinstance(deviceKeys, dict): if not E2EEvalidDevice(deviceKeys): self._400() return