From 468f00cd1ce132b74545c5f95eec5ce19b946593 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 30 Apr 2018 11:37:23 -0400 Subject: [PATCH] Rename 'joinchallenge' to 'enroll' Seems like a better word to use. --- confluent_server/confluent/collective/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/collective/manager.py b/confluent_server/confluent/collective/manager.py index 7b8f1a9b..cb68a9d3 100644 --- a/confluent_server/confluent/collective/manager.py +++ b/confluent_server/confluent/collective/manager.py @@ -64,7 +64,7 @@ def handle_connection(connection, cert, request, local=False): invitation, mycert, cert)) tlvdata.recv(remote) # ignore banner tlvdata.recv(remote) # ignore authpassed: 0 - tlvdata.send(remote, {'collective': {'operation': 'joinchallenge', + tlvdata.send(remote, {'collective': {'operation': 'enroll', 'name': name, 'hmac': proof}}) rsp = tlvdata.recv(remote) proof = rsp['collective']['approval'] @@ -74,7 +74,7 @@ def handle_connection(connection, cert, request, local=False): return tlvdata.send(connection, {'collective': {'status': 'Success'}}) currentleader = rsp['collective']['leader'] - if 'joinchallenge' == operation: + if 'enroll' == operation: mycert = util.get_certificate_from_file('/etc/confluent/srvcert.pem') proof = base64.b64decode(request['hmac']) myrsp = invites.check_client_proof(request['name'], mycert,