From 127ab453293df1f4da759302dd101bab250a8f49 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Mon, 29 Jan 2024 12:20:57 +0200 Subject: [PATCH 1/3] Send back an ExtendedDesktopSize to a SetDesktopSize request even when resize is not allowed --- common/rfb/VNCSConnectionST.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx index 511e12c..c470de7 100644 --- a/common/rfb/VNCSConnectionST.cxx +++ b/common/rfb/VNCSConnectionST.cxx @@ -997,8 +997,8 @@ void VNCSConnectionST::setDesktopSize(int fb_width, int fb_height, { unsigned int result; - if (!(accessRights & AccessSetDesktopSize)) return; - if (!rfb::Server::acceptSetDesktopSize) return; + if (!(accessRights & AccessSetDesktopSize)) goto justnotify; + if (!rfb::Server::acceptSetDesktopSize) goto justnotify; // Don't bother the desktop with an invalid configuration if (!layout.validate(fb_width, fb_height)) { @@ -1021,6 +1021,14 @@ void VNCSConnectionST::setDesktopSize(int fb_width, int fb_height, throw Exception("Desktop configured a different screen layout than requested"); server->notifyScreenLayoutChange(this); } + + return; + + justnotify: + writer()->writeExtendedDesktopSize(reasonClient, resultProhibited, + server->pb->getRect().width(), + server->pb->getRect().height(), + server->screenLayout); } void VNCSConnectionST::fence(rdr::U32 flags, unsigned len, const char data[]) From ae70375afe010cd812e6c4abb38305bbe6672a14 Mon Sep 17 00:00:00 2001 From: Matt McClaskey Date: Mon, 29 Jan 2024 10:38:31 -0500 Subject: [PATCH 2/3] KASM-5523 update novnc ref --- .gitmodules | 2 +- kasmweb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e43a13a..fc7e705 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "kasmweb"] path = kasmweb url = https://github.com/kasmtech/noVNC.git - branch = master + branch = bugfix/KASM-5523_handle_failure_to_resize diff --git a/kasmweb b/kasmweb index 7ce3f14..5226573 160000 --- a/kasmweb +++ b/kasmweb @@ -1 +1 @@ -Subproject commit 7ce3f140f5019b6485bdd64d8e154935275576f3 +Subproject commit 5226573cdd55067c9611161fc6ddd929e861abd2 From f02fbb0e2df236ad57edea32f9389327ff5928ec Mon Sep 17 00:00:00 2001 From: Matt McClaskey Date: Tue, 30 Jan 2024 11:59:12 -0500 Subject: [PATCH 3/3] update novnc ref to master --- .gitmodules | 2 +- kasmweb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index fc7e705..e43a13a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "kasmweb"] path = kasmweb url = https://github.com/kasmtech/noVNC.git - branch = bugfix/KASM-5523_handle_failure_to_resize + branch = master diff --git a/kasmweb b/kasmweb index 5226573..4c6127b 160000 --- a/kasmweb +++ b/kasmweb @@ -1 +1 @@ -Subproject commit 5226573cdd55067c9611161fc6ddd929e861abd2 +Subproject commit 4c6127b47b274ee4c8e98a67789613fddf61f1b7