Fix bugs in the icon-receiver #153
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
marmarek
approved these changes
Oct 18, 2024
marmarek
requested changes
Oct 18, 2024
window-icon-updater/icon-receiver
Outdated
| @@ -342,7 +342,7 @@ class IconReceiver(object): | |||
| try: | |||
| # Parse header from qrexec | |||
| header = await reader.readuntil(b'\0') | |||
| header_parts = header.decode('ascii').split(' ') | |||
| header_parts = header.decode('ascii').split(' ').restrip('\x00') | |||
There was a problem hiding this comment.
List doesn't have restrip() method. Did you mean .rstrip() just before .split() ?
There was a problem hiding this comment.
It is a mistake.
Yep, the rstrip should be added before split.
Or at header_parts[1].rstrip('\x00')
There was a problem hiding this comment.
Better before split, as this is terminator of this whole header, not a specific part
marmarek
requested changes
Oct 24, 2024
| @@ -342,7 +342,7 @@ class IconReceiver(object): | |||
| try: | |||
| # Parse header from qrexec | |||
| header = await reader.readuntil(b'\0') | |||
| header_parts = header.decode('ascii').split(' ') | |||
| header_parts = header.decode('ascii').restrip('\x00').split(' ') | |||
There was a problem hiding this comment.
Suggested change
| header_parts = header.decode('ascii').restrip('\x00').split(' ') | |
| header_parts = header.decode('ascii').rstrip('\x00').split(' ') |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
guivm-gui-agenttoguivmicon-recieverrunning on guivm other than dom0 the header received is as follow:Request coming from appvm to dom0
\x00cause a bug when trying to get the color of the vm usingqubesadminapi.