Cherrypicked changes for 1.4.1 minor update

This commit is contained in:
Matt McClaskey 2025-12-01 11:33:52 -05:00
parent 663b6d6a0b
commit 39bd5b98af
No known key found for this signature in database
22 changed files with 98 additions and 9 deletions

2
.gitmodules vendored
View file

@ -1,7 +1,7 @@
[submodule "kasmweb"]
path = kasmweb
url = https://github.com/kasmtech/noVNC.git
branch = release/1.3.0
branch = release/1.3.1
[submodule "kasmvnc-functional-tests"]
path = kasmvnc-functional-tests
url = git@gitlab.com:kasm-technologies/internal/kasmvnc-functional-tests.git

View file

@ -3,7 +3,7 @@
# Contributor:
# Maintainer: Kasm Technologies LLC <info@kasmweb.com>
pkgname=kasmvncserver
pkgver=1.4.0
pkgver=1.4.1
pkgrel=0
pkgdesc="KasmVNC provides remote web-based access to a Desktop or application."
url="https://github.com/kasmtech/KasmVNC"

View file

@ -59,6 +59,7 @@ ConnParams::ConnParams()
supportsWEBP(false), supportsQOI(false),
supportsSetDesktopSize(false), supportsFence(false),
supportsContinuousUpdates(false), supportsExtendedClipboard(false),
supportsDisconnectNotify(false),
supportsUdp(false),
compressLevel(2), qualityLevel(-1), fineQualityLevel(-1),
subsampling(subsampleUndefined), name_(0), cursorPos_(0, 0), verStrPos(0),
@ -147,6 +148,7 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
supportsQEMUKeyEvent = false;
supportsWEBP = false;
supportsQOI = false;
supportsDisconnectNotify = false;
compressLevel = -1;
qualityLevel = -1;
fineQualityLevel = -1;
@ -215,6 +217,10 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
supportsQOI = true;
clientparlog("qoi", true);
break;
case pseudoEncodingKasmDisconnectNotify:
supportsDisconnectNotify = true;
clientparlog("disconnectNotify", true);
break;
case pseudoEncodingFence:
supportsFence = true;
clientparlog("fence", true);

View file

@ -117,6 +117,7 @@ namespace rfb {
bool supportsFence;
bool supportsContinuousUpdates;
bool supportsExtendedClipboard;
bool supportsDisconnectNotify;
bool supportsUdp;

View file

@ -104,3 +104,7 @@ void SMsgHandler::setDesktopSize(int fb_width, int fb_height,
cp.height = fb_height;
cp.screenLayout = layout;
}
void SMsgHandler::keepAlive()
{
}

View file

@ -61,6 +61,7 @@ namespace rfb {
virtual void sendStats(const bool toClient = true) = 0;
virtual void handleFrameStats(rdr::U32 all, rdr::U32 render) = 0;
virtual void keepAlive();
virtual bool canChangeKasmSettings() const = 0;

View file

@ -106,6 +106,9 @@ void SMsgReader::readMsg()
case msgTypeUnixRelay:
readUnixRelay();
break;
case msgTypeKeepAlive:
readKeepAlive();
break;
default:
fprintf(stderr, "unknown message type %d\n", msgType);
throw Exception("unknown message type");
@ -319,6 +322,11 @@ void SMsgReader::readFrameStats()
handler->handleFrameStats(all, render);
}
void SMsgReader::readKeepAlive()
{
handler->keepAlive();
}
void SMsgReader::readQEMUMessage()
{
int subType = is->readU8();

View file

@ -59,6 +59,7 @@ namespace rfb {
void readRequestStats();
void readFrameStats();
void readBinaryClipboard();
void readKeepAlive();
void readQEMUMessage();
void readQEMUKeyEvent();

View file

@ -791,3 +791,20 @@ void SMsgWriter::writeUserLeftSession(const std::string& username)
os->writeString(username.c_str());
endMsg();
}
void SMsgWriter::writeDisconnectNotify(bool graceful, const char *reason)
{
if (!cp->supportsDisconnectNotify)
return;
const char *msg = reason ? reason : "";
size_t len = strlen(msg);
startMsg(msgTypeServerDisconnect);
os->writeU8(graceful ? 1 : 0);
os->pad(3);
os->writeU32(len);
if (len > 0)
os->writeBytes(msg, len);
endMsg();
}

View file

@ -135,6 +135,7 @@ namespace rfb {
void writeUserJoinedSession(const std::string& username);
void writeUserLeftSession(const std::string& username);
void writeDisconnectNotify(bool graceful, const char *reason);
protected:
void startMsg(int type);

View file

@ -49,6 +49,10 @@ static LogWriter vlog("VNCSConnST");
static Cursor emptyCursor(0, 0, Point(0, 0), NULL);
namespace {
const rdr::U32 CLIENT_KEEPALIVE_KEYSYM = 1;
}
extern rfb::BoolParameter disablebasicauth;
extern "C" char unixrelaynames[MAX_UNIX_RELAYS][MAX_UNIX_RELAY_NAME_LEN];
@ -557,6 +561,13 @@ int VNCSConnectionST::checkIdleTimeout()
return secsToMillis(idleTimeout);
}
if (timeLeft <= 0) {
if (cp.supportsDisconnectNotify) {
try {
writer()->writeDisconnectNotify(true, "Idle timeout");
} catch (rdr::Exception& e) {
vlog.debug("Failed to send disconnect notice: %s", e.str());
}
}
close("Idle timeout");
return 0;
}
@ -861,6 +872,10 @@ public:
void VNCSConnectionST::keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down) {
rdr::U32 lookup;
if (keycode == 0 && keysym == CLIENT_KEEPALIVE_KEYSYM) {
return;
}
lastEventTime = time(0);
server->lastUserInputTime = lastEventTime;
if (!(accessRights & AccessKeyEvents)) return;
@ -1699,6 +1714,11 @@ void VNCSConnectionST::handleFrameStats(rdr::U32 all, rdr::U32 render)
frameTracking = false;
}
void VNCSConnectionST::keepAlive()
{
// Keepalive traffic should not influence idle disconnect timers.
}
// setCursor() is called whenever the cursor has changed shape or pixel format.
// If the client supports local cursor then it will arrange for the cursor to
// be sent to the client.

View file

@ -254,6 +254,7 @@ namespace rfb {
int x, int y, int w, int h);
virtual void handleClipboardAnnounce(bool available);
virtual void handleClipboardAnnounceBinary(const unsigned num, const char mimes[][32]);
virtual void keepAlive();
virtual void udpUpgrade(const char *resp);
virtual void subscribeUnixRelay(const char *name);
virtual void unixRelay(const char *name, const rdr::U8 *buf, const unsigned len);

View file

@ -86,6 +86,7 @@ namespace rfb {
const int pseudoEncodingVideoOutTimeLevel1 = -1986;
const int pseudoEncodingVideoOutTimeLevel100 = -1887;
const int pseudoEncodingQOI = -1886;
const int pseudoEncodingKasmDisconnectNotify = -1885;
// VMware-specific
const int pseudoEncodingVMwareCursor = 0x574d5664;

View file

@ -35,6 +35,8 @@ namespace rfb {
const int msgTypeUpgradeToUdp = 181;
const int msgTypeSubscribeUnixRelay = 182;
const int msgTypeUnixRelay = 183;
const int msgTypeKeepAlive = 184;
const int msgTypeServerDisconnect = 185;
const int msgTypeServerFence = 248;
const int msgTypeUserAddedToSession = 253;
@ -61,6 +63,8 @@ namespace rfb {
//const int msgTypeUpgradeToUdp = 181;
//const int msgTypeSubscribeUnixRelay = 182;
//const int msgTypeUnixRelay = 183;
//const int msgTypeKeepAlive = 184;
//const int msgTypeServerDisconnect = 185;
const int msgTypeClientFence = 248;

8
debian/changelog vendored
View file

@ -1,3 +1,11 @@
kasmvnc (1.4.1-1) unstable; urgency=medium
* Fixed bug with enforcement of server-side idle-disconnect.
* Added support for graceful disconnect, allowing the client to auto-reconnect on a non-graceful disconnect and not when the server gracefully disconnects.
* Fixed display manager UI to work on touch screens.
-- Kasm Technologies LLC <info@kasmweb.com> Mon, 01 Dec 2025 10:42:46 +0000
kasmvnc (1.4.0-1) unstable; urgency=medium
* Added new API call for retrieving active sessions.

View file

@ -1,5 +1,5 @@
Name: kasmvncserver
Version: 1.4.0
Version: 1.4.1
Release: 1%{?dist}
Summary: VNC server accessible from a web browser
@ -83,6 +83,10 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
%doc /usr/share/doc/kasmvncserver/README.md
%changelog
* Mon Dec 01 2025 KasmTech <info@kasmweb.com> - 1.4.1-1
- Fixed bug with enforcement of server-side idle-disconnect.
- Added support for graceful disconnect, allowing the client to auto-reconnect on a non-graceful disconnect and not when the server gracefully disconnects.
- Fixed display manager UI to work on touch screens.
* Fri Aug 01 2025 KasmTech <info@kasmweb.com> - 1.4.0-1
- Added new API call for retrieving active sessions.
- Added message propagation to clients other users connect or disconnect from the same session.

@ -1 +1 @@
Subproject commit 8af65a338e92c055fbdc958404a87d719cf05d8a
Subproject commit fa9906edb45bd055dba887132323026078187069

@ -1 +1 @@
Subproject commit ae1e012fe34e5dd29478575d2a1253dfa916ed24
Subproject commit 4166ae84781910977605ebda9c03de105839367b

View file

@ -1,5 +1,5 @@
Name: kasmvncserver
Version: 1.4.0
Version: 1.4.1
Release: leap15
Summary: VNC server accessible from a web browser
@ -81,6 +81,10 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
%doc /usr/share/doc/kasmvncserver/README.md
%changelog
* Mon Dec 01 2025 KasmTech <info@kasmweb.com> - 1.4.1-1
- Fixed bug with enforcement of server-side idle-disconnect.
- Added support for graceful disconnect, allowing the client to auto-reconnect on a non-graceful disconnect and not when the server gracefully disconnects.
- Fixed display manager UI to work on touch screens.
* Fri Aug 01 2025 KasmTech <info@kasmweb.com> - 1.4.0-1
- Added new API call for retrieving active sessions.
- Added message propagation to clients other users connect or disconnect from the same session.

View file

@ -1,5 +1,5 @@
Name: kasmvncserver
Version: 1.4.0
Version: 1.4.1
Release: 1%{?dist}
Summary: VNC server accessible from a web browser
@ -82,6 +82,10 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
%doc /usr/share/doc/kasmvncserver/README.md
%changelog
* Mon Dec 01 2025 KasmTech <info@kasmweb.com> - 1.4.1-1
- Fixed bug with enforcement of server-side idle-disconnect.
- Added support for graceful disconnect, allowing the client to auto-reconnect on a non-graceful disconnect and not when the server gracefully disconnects.
- Fixed display manager UI to work on touch screens.
* Fri Aug 01 2025 KasmTech <info@kasmweb.com> - 1.4.0-1
- Added new API call for retrieving active sessions.
- Added message propagation to clients other users connect or disconnect from the same session.

View file

@ -1,5 +1,5 @@
Name: kasmvncserver
Version: 1.4.0
Version: 1.4.1
Release: 1%{?dist}
Summary: VNC server accessible from a web browser
@ -82,6 +82,10 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
%doc /usr/share/doc/kasmvncserver/README.md
%changelog
* Mon Dec 01 2025 KasmTech <info@kasmweb.com> - 1.4.1-1
- Fixed bug with enforcement of server-side idle-disconnect.
- Added support for graceful disconnect, allowing the client to auto-reconnect on a non-graceful disconnect and not when the server gracefully disconnects.
- Fixed display manager UI to work on touch screens.
* Fri Aug 01 2025 KasmTech <info@kasmweb.com> - 1.4.0-1
- Added new API call for retrieving active sessions.
- Added message propagation to clients other users connect or disconnect from the same session.

View file

@ -95,7 +95,7 @@ from the X Consortium.
#undef VENDOR_STRING
#include "version-config.h"
#define XVNCVERSION "KasmVNC 1.4.0"
#define XVNCVERSION "KasmVNC 1.4.1"
#define XVNCCOPYRIGHT ("Copyright (C) 1999-2018 KasmVNC Team and many others (see README.me)\n" \
"See http://kasmweb.com for information on KasmVNC.\n")