From 58bf226d23c2a17e7ef0f3cef8755e7eed97dc1c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 13 Jul 2018 10:50:17 -0400 Subject: [PATCH] Relay error from server about token issue --- confluent_server/confluent/collective/manager.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/confluent_server/confluent/collective/manager.py b/confluent_server/confluent/collective/manager.py index 87477241..9ea5a6c5 100644 --- a/confluent_server/confluent/collective/manager.py +++ b/confluent_server/confluent/collective/manager.py @@ -222,11 +222,19 @@ def handle_connection(connection, cert, request, local=False): tlvdata.send(remote, {'collective': {'operation': 'enroll', 'name': name, 'hmac': proof}}) rsp = tlvdata.recv(remote) + if 'error' in rsp: + tlvdata.send(connection, {'collective': + {'status': rsp['error']}}) + connection.close() + return proof = rsp['collective']['approval'] proof = base64.b64decode(proof) j = invites.check_server_proof(invitation, mycert, cert, proof) if not j: remote.close() + tlvdata.send(connection, {'collective': + {'status': 'Bad server token'}}) + connection.close() return tlvdata.send(connection, {'collective': {'status': 'Success'}}) connection.close()