Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix local socket communication

Browse Source 
Don't try to send 'None' argument.
Close writing end after sending full request.

QubesOS/qubes-issues#853
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-27 20:15:24 +01:00
parent 3e73b242d1
commit 45ab24ce12
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesmgmt/app.py
View File

@ -109,12 +109,15 @@ class QubesLocal(QubesBase):
# src, method, dest, arg # src, method, dest, arg
for call_arg in ('dom0', method, dest, arg): for call_arg in ('dom0', method, dest, arg):
if call_arg is not None:
client_socket.sendall(call_arg.encode('ascii')) client_socket.sendall(call_arg.encode('ascii'))
client_socket.sendall(b'\0') client_socket.sendall(b'\0')
if payload is not None: if payload is not None:
client_socket.sendall(payload) client_socket.sendall(payload)
return_data = b''.join(iter(client_socket.recv(BUF_SIZE), b'')) client_socket.shutdown(socket.SHUT_WR)
return_data = b''.join(iter(lambda: client_socket.recv(BUF_SIZE), b''))
return self._parse_qubesd_response(return_data) return self._parse_qubesd_response(return_data)