Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement GUI protocol 1.4 #105

Merged
merged 4 commits into from
Jul 20, 2022
Merged

Implement GUI protocol 1.4 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25434dd
Check the return value of snprintf()
DemiMarie Jul 6, 2022
77b1041
Check XGetWindowAttributes return value
DemiMarie Jul 6, 2022
42a27a1
Bidirectional GUI protocol negotiation
DemiMarie Jul 6, 2022
ea022e9
Allow using older qubes-gui-protocol.h
DemiMarie Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions gui-daemon/xside.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
/* Supported protocol version */

#define PROTOCOL_VERSION_MAJOR 1
#define PROTOCOL_VERSION_MINOR 3
#define PROTOCOL_VERSION (PROTOCOL_VERSION_MAJOR << 16 | PROTOCOL_VERSION_MINOR)
#define PROTOCOL_VERSION_MINOR 4
#define PROTOCOL_VERSION(x, y) ((x) << 16 | (y))

#if !(PROTOCOL_VERSION_MAJOR == QUBES_GUID_PROTOCOL_VERSION_MAJOR && \
PROTOCOL_VERSION_MINOR <= QUBES_GUID_PROTOCOL_VERSION_MINOR)
3 <= QUBES_GUID_PROTOCOL_VERSION_MINOR)
# error Incompatible qubes-gui-protocol.h.
#endif

Expand Down Expand Up @@ -744,7 +744,8 @@ void reload(Ghandles * g) {

g->screen = DefaultScreen(g->display);
g->root_win = RootWindow(g->display, g->screen);
XGetWindowAttributes(g->display, g->root_win, &attr);
if (!XGetWindowAttributes(g->display, g->root_win, &attr))
errx(1, "Cannot query root window attributes!");
g->root_width = _VIRTUALX(attr.width);
g->root_height = attr.height;
update_work_area(g);
Expand Down Expand Up @@ -1311,7 +1312,7 @@ static int is_special_keypress(Ghandles * g, const XKeyEvent * ev, XID remote_wi
if (len > 0) {
/* MSG_CLIPBOARD_DATA used to use the window field to pass the length
of the blob, be aware when working with old implementations. */
if (g->agent_version < 0x00010002)
if (g->protocol_version < PROTOCOL_VERSION(1, 2))
hdr.window = len;
else
hdr.window = remote_winid;
Expand Down Expand Up @@ -3600,7 +3601,14 @@ static void send_xconf(Ghandles * g)
{
struct msg_xconf xconf;
XWindowAttributes attr;
XGetWindowAttributes(g->display, g->root_win, &attr);
if (!XGetWindowAttributes(g->display, g->root_win, &attr))
errx(1, "Cannot query root window attributes!");
if (g->protocol_version >= PROTOCOL_VERSION(1, 4)) {
/* Bidirectional protocol negotiation is supported */
_Static_assert(sizeof g->protocol_version == 4,
"g->protocol_version must be a uint32_t");
write_struct(g->vchan, g->protocol_version);
}
xconf.w = _VIRTUALX(attr.width);
xconf.h = attr.height;
xconf.depth = attr.depth;
Expand All @@ -3619,30 +3627,32 @@ static void get_protocol_version(Ghandles * g)
version_major = untrusted_version >> 16;
version_minor = untrusted_version & 0xffff;

if (version_major == PROTOCOL_VERSION_MAJOR &&
version_minor <= PROTOCOL_VERSION_MINOR) {
if (version_major == PROTOCOL_VERSION_MAJOR) {
/* agent is compatible */
g->agent_version = version_major << 16 | version_minor;
g->protocol_version = PROTOCOL_VERSION(version_major, min(version_minor, PROTOCOL_VERSION_MINOR));
return;
}
if (version_major < PROTOCOL_VERSION_MAJOR)
if (version_major < PROTOCOL_VERSION_MAJOR) {
/* agent is too old */
snprintf(message, sizeof message, "%s %s \""
if ((unsigned)snprintf(message, sizeof message, "%s %s \""
"The GUI agent that runs in the VM '%s' implements outdated protocol (%d:%d), and must be updated.\n\n"
"To start and access the VM or template without GUI virtualization, use the following commands:\n"
"qvm-start --no-guid vmname\n"
"qvm-console-dispvm vmname\"",
g->use_kdialog ? KDIALOG_PATH : ZENITY_PATH,
g->use_kdialog ? "--sorry" : "--error --text ",
g->vmname, version_major, version_minor);
else
g->vmname, version_major, version_minor) >= sizeof message)
abort();
} else {
/* agent is too new */
snprintf(message, sizeof message, "%s %s \""
if ((unsigned)snprintf(message, sizeof message, "%s %s \""
"The Dom0 GUI daemon do not support protocol version %d:%d, requested by the VM '%s'.\n"
"To update Dom0, use 'qubes-dom0-update' command or do it via qubes-manager\"",
g->use_kdialog ? KDIALOG_PATH : ZENITY_PATH,
g->use_kdialog ? "--sorry" : "--error --text ",
version_major, version_minor, g->vmname);
version_major, version_minor, g->vmname) >= sizeof message)
abort();
}
ignore_result(system(message));
exit(1);
}
Expand Down
3 changes: 2 additions & 1 deletion gui-daemon/xside.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ struct _global_handles {
char vmname[32]; /* name of VM */
int domid; /* Xen domain id (GUI) */
int target_domid; /* Xen domain id (VM) - can differ from domid when GUI is stubdom */
uint32_t agent_version; /* gui-agent (protocol) version */
uint32_t protocol_version; /* Negotiated protocol version. Must be uint32_t
as it is used as a protocol message. */
char *cmdline_color; /* color of frame */
uint32_t label_color_rgb; /* color of the frame in RGB */
char *cmdline_icon; /* icon hint for WM */
Expand Down