Skip to content

Commit ed101ff

Browse files
committed
Merge remote-tracking branch 'origin/pr/153'
* origin/pr/153: change restrip to rstrip Move rstrip before split remove trailing \x00 The trailing \x00 in the request header make the domain name as follow (domain\x00). Which cause a bug when listing domains using qubesadminapi. This bug occured when the icon-receiver is running on guivm other than dom0. Update guivm service name Pull request description: - Update `guivm-gui-agent` to `guivm` - When the `icon-reciever` running on guivm other than dom0 the header received is as follow: Request coming from appvm to dom0 ``` service vm-name keyword adminvm\x00 ``` Request coming from appvm to guivm ``` service vm-name\x00 ``` The trailing `\x00` cause a bug when trying to get the color of the vm using `qubesadminapi`.
2 parents 2af808a + 8e3e502 commit ed101ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

window-icon-updater/icon-receiver

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ class IconReceiver(object):
342342
try:
343343
# Parse header from qrexec
344344
header = await reader.readuntil(b'\0')
345-
header_parts = header.decode('ascii').split(' ')
345+
header_parts = header.decode('ascii').rstrip('\x00').split(' ')
346346
assert len(header_parts) >= 2, header_parts
347347

348348
service_name = header_parts[0]
@@ -388,7 +388,7 @@ def main():
388388
args = parser.parse_args()
389389

390390
if not args.force:
391-
if (not os.path.exists('/var/run/qubes-service/guivm-gui-agent') and
391+
if (not os.path.exists('/var/run/qubes-service/guivm') and
392392
not os.path.exists('/etc/qubes-release')):
393393

394394
print('Not in GuiVM or dom0, exiting '

0 commit comments

Comments
 (0)