xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 19:40:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix encoding of the response proof

Browse Source 
The response was not decoded, causing it to always fail.
This commit is contained in:
Jarrod Johnson 2018-04-25 20:49:08 -04:00
parent 78bf1d5acd
commit fb9925bb84
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
confluent_server/confluent/collective/manager.py
View File

@ -64,13 +64,16 @@ def handle_connection(connection, cert, request, local=False):
'name': name, 'hmac': proof}})
rsp = tlvdata.recv(remote)
proof = rsp['collective']['approval']
proof = base64.b64decode(proof)
j = invites.check_server_proof(invitation, mycert, cert, proof)
if not j:
tlvdata.send(connection,
{'errorcode': 500,
'error': 'Response failed validation'})
return
tlvdata.send(remote, {'collective': 'success'})
tlvdata.send(remote, {'collective': {'success': True}})
tlvdata.send(connection, {'collective': {'status': 'Success'}})
#Ok, here start getting assimilated, connect to get the database and register for changes...
if 'joinchallenge' == operation:
mycert = util.get_certificate_from_file('/etc/confluent/srvcert.pem')
proof = base64.b64decode(request['hmac'])
@ -83,5 +86,6 @@ def handle_connection(connection, cert, request, local=False):
myrsp = base64.b64encode(myrsp)
tlvdata.send(connection, {'collective': {'approval': myrsp}})
clientready = tlvdata.recv(connection)
print(repr(clientready))
collcerts[request['name']] = cert
if clientready.get('collective', {}).get('success', False):
collcerts[request['name']] = cert
# store certificate signature for the collective trust