Merge branch 'bugfix/KASM-5743_bufixes_1.2.1' into 'release/1.2.1'

Resolve KASM-5743 "Bugfix/ bufixes 1.2.1"

See merge request kasm-technologies/internal/KasmVNC!130

.gitlab-ci.yml

@@ -11,8 +11,7 @@ variables:
   # arm builds, because build_debian_buster_arm matches build_debian_buster.
   # "BUILD_JOBS: none" won't build any build jobs, nor www.
   BUILD_JOBS: all
-  DOCKER_HOST: tcp://docker:2375
+  DOCKER_HOST: unix://
-  DOCKER_TLS_CERTDIR: ""
 
 workflow:
   rules:
@@ -39,13 +38,11 @@ stages:
 
 default:
   tags:
-    - oci-fixed-amd
+    - oci-fixed-amd64
 
 build_www:
   stage: www
   allow_failure: false
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
   script:
@@ -69,8 +66,6 @@ build_www:
 build_ubuntu_bionic:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -89,7 +84,7 @@ build_ubuntu_bionic_arm:
   stage: build
   allow_failure: false
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -107,8 +102,6 @@ build_ubuntu_bionic_arm:
 build_ubuntu_focal:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -127,7 +120,7 @@ build_ubuntu_focal_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -145,8 +138,6 @@ build_ubuntu_focal_arm:
 build_ubuntu_jammy:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -165,7 +156,7 @@ build_ubuntu_jammy_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -183,8 +174,6 @@ build_ubuntu_jammy_arm:
 build_debian_buster:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -203,7 +192,7 @@ build_debian_buster_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -221,8 +210,6 @@ build_debian_buster_arm:
 build_debian_bullseye:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -241,7 +228,7 @@ build_debian_bullseye_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -260,8 +247,6 @@ build_debian_bullseye_arm:
 build_debian_bookworm:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -280,7 +265,7 @@ build_debian_bookworm_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -298,8 +283,6 @@ build_debian_bookworm_arm:
 build_kali_rolling:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -318,7 +301,7 @@ build_kali_rolling_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -336,8 +319,6 @@ build_kali_rolling_arm:
 build_centos7:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -355,8 +336,6 @@ build_centos7:
 build_oracle_8:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -375,7 +354,7 @@ build_oracle_8_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -393,8 +372,6 @@ build_oracle_8_arm:
 build_oracle_9:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -413,7 +390,7 @@ build_oracle_9_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -431,8 +408,6 @@ build_oracle_9_arm:
 build_opensuse_15:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -451,7 +426,7 @@ build_opensuse_15_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -469,8 +444,6 @@ build_opensuse_15_arm:
 build_fedora_thirtyseven:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -489,7 +462,7 @@ build_fedora_thirtyseven_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -507,8 +480,6 @@ build_fedora_thirtyseven_arm:
 build_fedora_thirtyeight:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -527,7 +498,7 @@ build_fedora_thirtyeight_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -542,49 +513,9 @@ build_fedora_thirtyeight_arm:
     paths:
       - output/
 
-build_fedora_thirtynine:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtynine;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtynine_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtynine;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
 build_alpine_317:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -603,7 +534,7 @@ build_alpine_317_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -620,8 +551,6 @@ build_alpine_317_arm:
 
 test:
   stage: test
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
   script:
@@ -631,8 +560,6 @@ test:
 build_alpine_318:
   stage: build
   allow_failure: true
-  tags:
-    - oci-fixed-amd
   before_script:
     - *prepare_build
     - *prepare_www
@@ -651,7 +578,7 @@ build_alpine_318_arm:
   stage: build
   allow_failure: true
   tags:
-    - oci-fixed-arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -666,49 +593,9 @@ build_alpine_318_arm:
     paths:
       - output/
 
-build_alpine_319:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 319;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_319_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 319;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
 upload:
   stage: upload
   image: ubuntu:focal
-  tags:
-    - oci-fixed-amd
   artifacts:
     paths:
       - output/
@@ -746,8 +633,6 @@ upload_build_preview:
   needs: ["upload"]
   dependencies: ["upload"]
   image: ubuntu:focal
-  tags:
-    - oci-fixed-amd
   before_script:
     - . .ci/upload.sh
   resource_group: upload_build_preview

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = release/1.2.1
+	branch = release/1.1.3

builder/dockerfile.alpine_319.apk.build

@@ -1,7 +0,0 @@
-FROM alpine:3.19
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker

builder/dockerfile.alpine_319.build

@@ -1,82 +0,0 @@
-FROM alpine:3.19
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 319
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.fedora_thirtynine.build

@@ -1,86 +0,0 @@
-FROM fedora:39
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME thirtynine
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]

builder/dockerfile.fedora_thirtynine.rpm.build

@@ -1,13 +0,0 @@
-FROM fedora:39
-
-RUN dnf install -y fedora-packager fedora-review
-RUN dnf install -y tree vim less
-RUN dnf install -y redhat-lsb-core
-RUN dnf install -y dnf-plugins-core
-
-COPY fedora/*.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker

builder/startup/deb/select-de.sh

@@ -198,7 +198,6 @@ generate_xstartup() {
 
   cat <<-SCRIPT > "$xstartup_script"
 #!/bin/sh
-set -x
 $de_cmd
 SCRIPT
   chmod +x "$xstartup_script"

centos/kasmvncserver.spec

@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.3.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser
 
@@ -83,18 +83,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md
 
 %changelog
-* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.3.1-1
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
-- Fix exception thrown on Firefox 124 and higher
+- Fix exception with Firefox 124 and later
-- Fix artifacts on high resolution secondary screens
+- Fix bug with watermarking on odd resolutions
-- Fixes for touch support on primary and secondary screens
-- Fix for Oculus keyboard input
-* Mon Feb 05 2024 KasmTech <info@kasmweb.com> - 1.3.0-1
-- Multi-monitor support.
-- Increased performance with watermark enabled.
-- Added support for Fedora 39 and Alpine 319.
-- Allow special characters in usernames.
-- Better logging of client settings when client connects or changes settings.
-- Add support for rotation of text-based watermark.
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-1
 - Add support for Unix relays for bidirectional communication between noVNC
   and containerized applications.

common/network/GetAPIMessager.cxx

@@ -550,7 +550,7 @@ void GetAPIMessager::netGetBottleneckStats(char *buf, uint32_t len) {
 		const char *id = it->first.c_str();
 		const char *data = it->second.c_str();
 
-		const char *at = strrchr(id, '@');
+		const char *at = strchr(id, '@');
 		if (!at)
 			continue;
 

common/network/Udp.cxx

@@ -40,7 +40,7 @@ using namespace network;
 static rfb::LogWriter vlog("WebUdp");
 static WuHost *host = NULL;
 
-rfb::IntParameter udpSize("udpSize", "UDP packet data size", 1296, 500, 1400);
+rfb::IntParameter udpSize("udpSize", "UDP packet data size", 1300, 500, 1400);
 
 extern settings_t settings;
 
@@ -95,11 +95,10 @@ void *udpserver(void *nport) {
 }
 
 // Send one packet, split into N UDP-sized pieces
-static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint32_t *id,
+static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint32_t *id) {
-			const uint32_t *frame) {
 	const uint32_t DATA_MAX = udpSize;
 
-	uint8_t buf[1400 + sizeof(uint32_t) * 5];
+	uint8_t buf[1400 + sizeof(uint32_t) * 4];
 	const uint32_t pieces = (len / DATA_MAX) + ((len % DATA_MAX) ? 1 : 0);
 
 	uint32_t i;
@@ -112,13 +111,12 @@ static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint
 		memcpy(&buf[4], &i, sizeof(uint32_t));
 		memcpy(&buf[8], &pieces, sizeof(uint32_t));
 		memcpy(&buf[12], &hash, sizeof(uint32_t));
-		memcpy(&buf[16], frame, sizeof(uint32_t));
 
-		memcpy(&buf[20], data, curlen);
+		memcpy(&buf[16], data, curlen);
 		data += curlen;
 		len -= curlen;
 
-		if (WuHostSendBinary(host, client, buf, curlen + sizeof(uint32_t) * 5) < 0)
+		if (WuHostSendBinary(host, client, buf, curlen + sizeof(uint32_t) * 4) < 0)
 			return 1;
 	}
 
@@ -127,8 +125,7 @@ static uint8_t udpsend(WuClient *client, const uint8_t *data, unsigned len, uint
 	return 0;
 }
 
-UdpStream::UdpStream(): OutStream(), client(NULL), total_len(0), id(0), failed(false),
+UdpStream::UdpStream(): OutStream(), client(NULL), total_len(0), id(0), failed(false) {
-	                frame(0) {
 	ptr = data;
 	end = data + UDPSTREAM_BUFSIZE;
 
@@ -140,7 +137,7 @@ void UdpStream::flush() {
 	total_len += len;
 
 	if (client) {
-		if (udpsend(client, data, len, &id, &frame)) {
+		if (udpsend(client, data, len, &id)) {
 			vlog.error("Error sending udp, client gone?");
 			failed = true;
 		}

common/network/Udp.h

@@ -40,10 +40,6 @@ namespace network {
 				client = cli;
 			}
 
-			void setFrameNumber(const unsigned in) {
-				frame = in;
-			}
-
 			bool isFailed() const;
 			void clearFailed();
 		private:
@@ -52,7 +48,6 @@ namespace network {
 			size_t total_len;
 			uint32_t id;
 			bool failed;
-			uint32_t frame;
 	};
 }
 

common/network/websocket.c

@@ -33,6 +33,7 @@
 #include <openssl/sha.h> /* sha1 hash */
 #include "websocket.h"
 #include "jsonescape.h"
+#include "kasmpasswd.h"
 #include <network/Blacklist.h>
 
 /*
@@ -1755,7 +1756,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
     }
 
     unsigned char owner = 0;
-    char inuser[USERNAME_LEN] = "-";
+    char inuser[32] = "-";
     if (!settings.disablebasicauth) {
         const char *hdr = strstr(handshake, "Authorization: Basic ");
         if (!hdr) {
@@ -1793,7 +1794,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
         if (resppw && *resppw)
             resppw++;
         if (settings.passwdfile) {
-            if (resppw && *resppw && resppw - response < USERNAME_LEN + 1) {
+            if (resppw && *resppw && resppw - response < 32) {
                 char pwbuf[4096];
                 struct kasmpasswd_t *set = readkasmpasswd(settings.passwdfile);
                 if (!set->num) {

common/network/websocket.h

@@ -2,7 +2,6 @@
 #include <stdint.h>
 #include "GetAPIEnums.h"
 #include "datelog.h"
-#include "kasmpasswd.h"
 
 #define BUFSIZE 65536
 #define DBUFSIZE (BUFSIZE * 3) / 4 - 20
@@ -58,7 +57,7 @@ typedef struct {
     char      *tin_buf;
     char      *tout_buf;
 
-    char      user[USERNAME_LEN];
+    char      user[32];
     char      ip[64];
 } ws_ctx_t;
 

common/rfb/ConnParams.cxx

@@ -24,7 +24,6 @@
 #include <rfb/Exception.h>
 #include <rfb/encodings.h>
 #include <rfb/ledStates.h>
-#include <rfb/LogWriter.h>
 #include <rfb/clipboardTypes.h>
 #include <rfb/ConnParams.h>
 #include <rfb/ServerCore.h>
@@ -33,19 +32,6 @@
 
 using namespace rfb;
 
-static LogWriter vlog("CP");
-
-static void clientparlog(const char name[], const bool applied) {
-  vlog.debug("Client sent config param %s, %s",
-             name,
-             applied ? "applied" : "ignored due to -IgnoreClientSettingsKasm/lacking perms");
-}
-static void clientparlog(const char name[], int val, const bool applied) {
-  vlog.debug("Client sent config param %s %d, %s",
-             name, val,
-             applied ? "applied" : "ignored due to -IgnoreClientSettingsKasm/lacking perms");
-}
-
 ConnParams::ConnParams()
   : majorVersion(0), minorVersion(0),
     width(0), height(0), useCopyRect(false),
@@ -161,71 +147,54 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
     switch (encodings[i]) {
     case encodingCopyRect:
       useCopyRect = true;
-      clientparlog("copyrect", true);
       break;
     case pseudoEncodingCursor:
       supportsLocalCursor = true;
-      clientparlog("cursor", true);
       break;
     case pseudoEncodingXCursor:
       supportsLocalXCursor = true;
-      clientparlog("xcursor", true);
       break;
     case pseudoEncodingCursorWithAlpha:
       supportsLocalCursorWithAlpha = true;
-      clientparlog("cursorWithAlpha", true);
       break;
     case pseudoEncodingVMwareCursor:
       supportsVMWareCursor = true;
-      clientparlog("vmwareCursor", true);
       break;
     case pseudoEncodingDesktopSize:
       supportsDesktopResize = true;
-      clientparlog("desktopSize", true);
       break;
     case pseudoEncodingExtendedDesktopSize:
       supportsExtendedDesktopSize = true;
-      clientparlog("extendedDesktopSize", true);
       break;
     case pseudoEncodingVMwareCursorPosition:
       supportsCursorPosition = true;
-      clientparlog("vmwareCursorPosition", true);
       break;
     case pseudoEncodingDesktopName:
       supportsDesktopRename = true;
-      clientparlog("desktopRename", true);
       break;
     case pseudoEncodingLastRect:
       supportsLastRect = true;
-      clientparlog("lastRect", true);
       break;
     case pseudoEncodingLEDState:
       supportsLEDState = true;
-      clientparlog("ledState", true);
       break;
     case pseudoEncodingQEMUKeyEvent:
       supportsQEMUKeyEvent = true;
-      clientparlog("qemuKeyEvent", true);
       break;
     case pseudoEncodingWEBP:
       supportsWEBP = true;
-      clientparlog("webp", true);
       break;
     case pseudoEncodingQOI:
       supportsQOI = true;
-      clientparlog("qoi", true);
       break;
     case pseudoEncodingFence:
       supportsFence = true;
-      clientparlog("fence", true);
       break;
     case pseudoEncodingContinuousUpdates:
       supportsContinuousUpdates = true;
-      clientparlog("continuousUpdates", true);
       break;
     case pseudoEncodingExtendedClipboard:
       supportsExtendedClipboard = true;
-      clientparlog("extendedClipboard", true);
       break;
     case pseudoEncodingSubsamp1X:
       subsampling = subsampleNone;
@@ -246,12 +215,8 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
       subsampling = subsample16X;
       break;
     case pseudoEncodingPreferBandwidth:
-      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings) {
+      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
         Server::preferBandwidth.setParam(true);
-        clientparlog("preferBandwidth", true);
-      } else {
-        clientparlog("preferBandwidth", false);
-      }
       break;
     case pseudoEncodingMaxVideoResolution:
       if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
@@ -260,133 +225,57 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
     }
 
     if (encodings[i] >= pseudoEncodingCompressLevel0 &&
-        encodings[i] <= pseudoEncodingCompressLevel9) {
+        encodings[i] <= pseudoEncodingCompressLevel9)
       compressLevel = encodings[i] - pseudoEncodingCompressLevel0;
-      clientparlog("compressLevel", compressLevel, true);
-    }
 
     if (encodings[i] >= pseudoEncodingQualityLevel0 &&
-        encodings[i] <= pseudoEncodingQualityLevel9) {
+        encodings[i] <= pseudoEncodingQualityLevel9)
       qualityLevel = encodings[i] - pseudoEncodingQualityLevel0;
-      clientparlog("qualityLevel", qualityLevel, true);
-    }
 
     if (encodings[i] >= pseudoEncodingFineQualityLevel0 &&
-        encodings[i] <= pseudoEncodingFineQualityLevel100) {
+        encodings[i] <= pseudoEncodingFineQualityLevel100)
       fineQualityLevel = encodings[i] - pseudoEncodingFineQualityLevel0;
-      clientparlog("fineQualityLevel", fineQualityLevel, true);
-    }
 
     if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings) {
       if (encodings[i] >= pseudoEncodingJpegVideoQualityLevel0 &&
-          encodings[i] <= pseudoEncodingJpegVideoQualityLevel9) {
+          encodings[i] <= pseudoEncodingJpegVideoQualityLevel9)
           Server::jpegVideoQuality.setParam(encodings[i] - pseudoEncodingJpegVideoQualityLevel0);
-          clientparlog("jpegVideoQuality", encodings[i] - pseudoEncodingJpegVideoQualityLevel0, true);
-      }
 
       if (encodings[i] >= pseudoEncodingWebpVideoQualityLevel0 &&
-          encodings[i] <= pseudoEncodingWebpVideoQualityLevel9) {
+          encodings[i] <= pseudoEncodingWebpVideoQualityLevel9)
           Server::webpVideoQuality.setParam(encodings[i] - pseudoEncodingWebpVideoQualityLevel0);
-          clientparlog("webpVideoQuality", encodings[i] - pseudoEncodingWebpVideoQualityLevel0, true);
-      }
 
       if (encodings[i] >= pseudoEncodingTreatLosslessLevel0 &&
-          encodings[i] <= pseudoEncodingTreatLosslessLevel10) {
+          encodings[i] <= pseudoEncodingTreatLosslessLevel10)
           Server::treatLossless.setParam(encodings[i] - pseudoEncodingTreatLosslessLevel0);
-          clientparlog("treatLossless", encodings[i] - pseudoEncodingTreatLosslessLevel0, true);
-      }
 
       if (encodings[i] >= pseudoEncodingDynamicQualityMinLevel0 &&
-          encodings[i] <= pseudoEncodingDynamicQualityMinLevel9) {
+          encodings[i] <= pseudoEncodingDynamicQualityMinLevel9)
           Server::dynamicQualityMin.setParam(encodings[i] - pseudoEncodingDynamicQualityMinLevel0);
-          clientparlog("dynamicQualityMin", encodings[i] - pseudoEncodingDynamicQualityMinLevel0, true);
-      }
 
       if (encodings[i] >= pseudoEncodingDynamicQualityMaxLevel0 &&
-          encodings[i] <= pseudoEncodingDynamicQualityMaxLevel9) {
+          encodings[i] <= pseudoEncodingDynamicQualityMaxLevel9)
           Server::dynamicQualityMax.setParam(encodings[i] - pseudoEncodingDynamicQualityMaxLevel0);
-          clientparlog("dynamicQualityMax", encodings[i] - pseudoEncodingDynamicQualityMaxLevel0, true);
-      }
 
       if (encodings[i] >= pseudoEncodingVideoAreaLevel1 &&
-          encodings[i] <= pseudoEncodingVideoAreaLevel100) {
+          encodings[i] <= pseudoEncodingVideoAreaLevel100)
           Server::videoArea.setParam(encodings[i] - pseudoEncodingVideoAreaLevel1 + 1);
-          clientparlog("videoArea", encodings[i] - pseudoEncodingVideoAreaLevel1 + 1, true);
-      }
 
       if (encodings[i] >= pseudoEncodingVideoTimeLevel0 &&
-          encodings[i] <= pseudoEncodingVideoTimeLevel100) {
+          encodings[i] <= pseudoEncodingVideoTimeLevel100)
           Server::videoTime.setParam(encodings[i] - pseudoEncodingVideoTimeLevel0);
-          clientparlog("videoTime", encodings[i] - pseudoEncodingVideoTimeLevel0, true);
-      }
 
       if (encodings[i] >= pseudoEncodingVideoOutTimeLevel1 &&
-          encodings[i] <= pseudoEncodingVideoOutTimeLevel100) {
+          encodings[i] <= pseudoEncodingVideoOutTimeLevel100)
           Server::videoOutTime.setParam(encodings[i] - pseudoEncodingVideoOutTimeLevel1 + 1);
-          clientparlog("videoOutTime", encodings[i] - pseudoEncodingVideoOutTimeLevel1 + 1, true);
-      }
 
       if (encodings[i] >= pseudoEncodingFrameRateLevel10 &&
-          encodings[i] <= pseudoEncodingFrameRateLevel60) {
+          encodings[i] <= pseudoEncodingFrameRateLevel60)
           Server::frameRate.setParam(encodings[i] - pseudoEncodingFrameRateLevel10 + 10);
-          clientparlog("frameRate", encodings[i] - pseudoEncodingFrameRateLevel10 + 10, true);
-      }
 
       if (encodings[i] >= pseudoEncodingVideoScalingLevel0 &&
-          encodings[i] <= pseudoEncodingVideoScalingLevel9) {
+          encodings[i] <= pseudoEncodingVideoScalingLevel9)
           Server::videoScaling.setParam(encodings[i] - pseudoEncodingVideoScalingLevel0);
-          clientparlog("videoScaling", encodings[i] - pseudoEncodingVideoScalingLevel0, true);
-      }
-    } else {
-      if (encodings[i] >= pseudoEncodingJpegVideoQualityLevel0 &&
-          encodings[i] <= pseudoEncodingJpegVideoQualityLevel9) {
-          clientparlog("jpegVideoQuality", encodings[i] - pseudoEncodingJpegVideoQualityLevel0, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingWebpVideoQualityLevel0 &&
-          encodings[i] <= pseudoEncodingWebpVideoQualityLevel9) {
-          clientparlog("webpVideoQuality", encodings[i] - pseudoEncodingWebpVideoQualityLevel0, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingTreatLosslessLevel0 &&
-          encodings[i] <= pseudoEncodingTreatLosslessLevel10) {
-          clientparlog("treatLossless", encodings[i] - pseudoEncodingTreatLosslessLevel0, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingDynamicQualityMinLevel0 &&
-          encodings[i] <= pseudoEncodingDynamicQualityMinLevel9) {
-          clientparlog("dynamicQualityMin", encodings[i] - pseudoEncodingDynamicQualityMinLevel0, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingDynamicQualityMaxLevel0 &&
-          encodings[i] <= pseudoEncodingDynamicQualityMaxLevel9) {
-          clientparlog("dynamicQualityMax", encodings[i] - pseudoEncodingDynamicQualityMaxLevel0, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingVideoAreaLevel1 &&
-          encodings[i] <= pseudoEncodingVideoAreaLevel100) {
-          clientparlog("videoArea", encodings[i] - pseudoEncodingVideoAreaLevel1 + 1, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingVideoTimeLevel0 &&
-          encodings[i] <= pseudoEncodingVideoTimeLevel100) {
-          clientparlog("videoTime", encodings[i] - pseudoEncodingVideoTimeLevel0, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingVideoOutTimeLevel1 &&
-          encodings[i] <= pseudoEncodingVideoOutTimeLevel100) {
-          clientparlog("videoOutTime", encodings[i] - pseudoEncodingVideoOutTimeLevel1 + 1, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingFrameRateLevel10 &&
-          encodings[i] <= pseudoEncodingFrameRateLevel60) {
-          clientparlog("frameRate", encodings[i] - pseudoEncodingFrameRateLevel10 + 10, false);
-      }
-
-      if (encodings[i] >= pseudoEncodingVideoScalingLevel0 &&
-          encodings[i] <= pseudoEncodingVideoScalingLevel9) {
-          clientparlog("videoScaling", encodings[i] - pseudoEncodingVideoScalingLevel0, false);
-      }
     }
 
     if (encodings[i] > 0)

common/rfb/EncodeManager.cxx

@@ -363,9 +363,6 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
     unsigned screenArea;
 
     updates++;
-    if (conn->cp.supportsUdp)
-      ((network::UdpStream *) conn->getOutStream(conn->cp.supportsUdp))->setFrameNumber(updates);
-
 
     // The video resolution may have changed, check it
     if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION])
@@ -423,6 +420,9 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
           nRects++;
     }
 
+    if (watermarkData)
+        packWatermark(changed);
+
     conn->writer()->writeFramebufferUpdateStart(nRects);
 
     writeCopyRects(copied, copyDelta);
@@ -440,7 +440,7 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
     if (!videoDetected) // In case detection happened between the calls
       writeRects(cursorRegion, renderedCursor);
 
-    if (watermarkData && conn->sendWatermark()) {
+    if (watermarkData) {
       beforeLength = conn->getOutStream(conn->cp.supportsUdp)->length();
 
       const Rect rect(0, 0, pb->width(), pb->height());

common/rfb/SConnection.h

@@ -198,10 +198,6 @@ namespace rfb {
         std::vector<unsigned char> data;
     };
 
-    virtual bool sendWatermark() const {
-        return false;
-    }
-
   protected:
     void setState(stateEnum s) { state_ = s; }
 

common/rfb/SMsgReader.cxx

@@ -171,9 +171,6 @@ void SMsgReader::readSetMaxVideoResolution()
   if (!rfb::Server::ignoreClientSettingsKasm && handler->canChangeKasmSettings()) {
     sprintf(tmp, "%ux%u", width, height);
     rfb::Server::maxVideoResolution.setParam(tmp);
-    vlog.debug("Client sent config param maxVideoResolution %ux%u, applied", width, height);
-  } else {
-    vlog.debug("Client sent config param maxVideoResolution %ux%u, ignored due to -IgnoreClientSettingsKasm/lacking perms", width, height);
   }
 }
 

common/rfb/SMsgWriter.cxx

@@ -39,7 +39,7 @@ static LogWriter vlog("SMsgWriter");
 
 SMsgWriter::SMsgWriter(ConnParams* cp_, rdr::OutStream* os_, rdr::OutStream* udps_)
   : cp(cp_), os(os_), udps(udps_),
-    nRectsInUpdate(0), dataRectsInUpdate(0), nRectsInHeader(0),
+    nRectsInUpdate(0), nRectsInHeader(0),
     needSetDesktopSize(false), needExtendedDesktopSize(false),
     needSetDesktopName(false), needSetCursor(false),
     needSetXCursor(false), needSetCursorWithAlpha(false),
@@ -340,7 +340,7 @@ void SMsgWriter::writeFramebufferUpdateStart(int nRects)
 
   os->writeU16(nRects);
 
-  nRectsInUpdate = dataRectsInUpdate = 0;
+  nRectsInUpdate = 0;
   if (nRects == 0xFFFF)
     nRectsInHeader = 0;
   else
@@ -365,7 +365,7 @@ void SMsgWriter::writeFramebufferUpdateEnd()
 
     // Send an UDP flip marker, if needed
     if (cp->supportsUdp) {
-      udps->writeS16(dataRectsInUpdate);
+      udps->writeS16(0);
       udps->writeS16(0);
       udps->writeU16(0);
       udps->writeU16(0);
@@ -394,7 +394,6 @@ void SMsgWriter::startRect(const Rect& r, int encoding)
 {
   if (++nRectsInUpdate > nRectsInHeader && nRectsInHeader)
     throw Exception("SMsgWriter::startRect: nRects out of sync");
-  ++dataRectsInUpdate;
 
   if (cp->supportsUdp) {
     udps->writeS16(r.tl.x);

common/rfb/SMsgWriter.h

@@ -165,7 +165,6 @@ namespace rfb {
     rdr::OutStream* udps;
 
     int nRectsInUpdate;
-    int dataRectsInUpdate;
     int nRectsInHeader;
 
     bool needSetDesktopSize;

common/rfb/ServerCore.cxx

@@ -201,10 +201,6 @@ rfb::IntParameter rfb::Server::DLP_WatermarkTimeOffsetMinutes
 ("DLP_WatermarkTimeOffsetMinutes",
  "Offset from UTC for -DLP_WatermarkText, minutes",
  0, -24 * 60, 24 * 60);
-rfb::IntParameter rfb::Server::DLP_WatermarkTextAngle
-("DLP_WatermarkTextAngle",
- "Angle for -DLP_WatermarkText rotation",
- 0, -359, 359);
 rfb::StringParameter rfb::Server::DLP_WatermarkImage
 ("DLP_WatermarkImage",
  "PNG file to use as a watermark",

common/rfb/ServerCore.h

@@ -52,7 +52,6 @@ namespace rfb {
     static IntParameter DLP_WatermarkFontSize;
     static IntParameter DLP_WatermarkTimeOffset;
     static IntParameter DLP_WatermarkTimeOffsetMinutes;
-    static IntParameter DLP_WatermarkTextAngle;
     static StringParameter DLP_ClipLog;
     static StringParameter DLP_Region;
     static StringParameter DLP_Clip_Types;

common/rfb/VNCSConnectionST.cxx

@@ -88,8 +88,8 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
   wordfree(&wexp);
 
   user[0] = '\0';
-  const char *at = strrchr(peerEndpoint.buf, '@');
+  const char *at = strchr(peerEndpoint.buf, '@');
-  if (at && at - peerEndpoint.buf > 1 && at - peerEndpoint.buf < USERNAME_LEN) {
+  if (at && at - peerEndpoint.buf > 1 && at - peerEndpoint.buf < 32) {
     memcpy(user, peerEndpoint.buf, at - peerEndpoint.buf);
     user[at - peerEndpoint.buf] = '\0';
   }
@@ -997,8 +997,8 @@ void VNCSConnectionST::setDesktopSize(int fb_width, int fb_height,
 {
   unsigned int result;
 
-  if (!(accessRights & AccessSetDesktopSize)) goto justnotify;
+  if (!(accessRights & AccessSetDesktopSize)) return;
-  if (!rfb::Server::acceptSetDesktopSize) goto justnotify;
+  if (!rfb::Server::acceptSetDesktopSize) return;
 
   // Don't bother the desktop with an invalid configuration
   if (!layout.validate(fb_width, fb_height)) {
@@ -1021,14 +1021,6 @@ 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[])
@@ -1643,7 +1635,7 @@ void VNCSConnectionST::sendStats(const bool toClient) {
 void VNCSConnectionST::handleFrameStats(rdr::U32 all, rdr::U32 render)
 {
   if (server->apimessager) {
-    const char *at = strrchr(peerEndpoint.buf, '@');
+    const char *at = strchr(peerEndpoint.buf, '@');
     if (!at)
       at = peerEndpoint.buf;
     else

common/rfb/VNCSConnectionST.h

@@ -35,8 +35,6 @@
 #include <rfb/Timer.h>
 #include <rfb/unixRelayLimits.h>
 
-#include "kasmpasswd.h"
-
 namespace rfb {
   class VNCServerST;
 
@@ -215,10 +213,6 @@ namespace rfb {
     virtual void sendUnixRelayData(const char name[], const unsigned char *buf,
                                    const unsigned len);
 
-    bool sendWatermark() const {
-        return server->sendWatermark;
-    }
-
   private:
     // SConnection callbacks
 
@@ -324,7 +318,7 @@ namespace rfb {
     rdr::U64 bstats_total[BS_NUM];
     struct timeval connStart;
 
-    char user[USERNAME_LEN];
+    char user[32];
     char kasmpasswdpath[4096];
     bool needsPermCheck;
 

common/rfb/VNCServerST.cxx

@@ -135,7 +135,7 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
     queryConnectionHandler(0), keyRemapper(&KeyRemapper::defInstance),
     lastConnectionTime(0), disableclients(false),
     frameTimer(this), apimessager(NULL), trackingFrameStats(0),
-    clipboardId(0), sendWatermark(false)
+    clipboardId(0)
 {
   lastUserInputTime = lastDisconnectTime = time(0);
   slog.debug("creating single-threaded server %s", name.buf);
@@ -223,9 +223,6 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)
 
   trackingClient[0] = 0;
 
-  if (watermarkData)
-    sendWatermark = true;
-
   if (Server::selfBench)
     SelfBench();
 }
@@ -282,9 +279,6 @@ void VNCServerST::addSocket(network::Socket* sock, bool outgoing)
 
   VNCSConnectionST* client = new VNCSConnectionST(this, sock, outgoing);
   client->init();
-
-  if (watermarkData)
-    sendWatermark = true;
 }
 
 void VNCServerST::removeSocket(network::Socket* sock) {
@@ -820,7 +814,7 @@ static void upgradeClientToUdp(const network::GetAPIMessager::action_data &act,
     inet_ntop(AF_INET, &act.udp.ip, buf, 32);
 
     const char * const who = (*ci)->getPeerEndpoint();
-    const char *start = strrchr(who, '@');
+    const char *start = strchr(who, '@');
     if (!start)
       continue;
     start++;
@@ -981,8 +975,8 @@ void VNCServerST::writeUpdate()
   }
 
   if (watermarkData && Server::DLP_WatermarkText[0] && watermarkTextNeedsUpdate(true)) {
-    // The text may have changed
+    // If using a text watermark, we have to mark everything as changed...
-    sendWatermark = true;
+    refreshClients();
   }
 
   comparer->getUpdateInfo(&ui, pb->getRect());
@@ -1110,8 +1104,6 @@ void VNCServerST::writeUpdate()
     }
   }
 
-  sendWatermark = false; // the client now caches it, only send once
-
   if (trackingFrameStats) {
     if (enctime) {
       const unsigned totalMs = msSince(&start);

common/rfb/VNCServerST.h

@@ -290,8 +290,6 @@ namespace rfb {
 
     void checkAPIMessages(network::GetAPIMessager *apimessager,
                           rdr::U8 &trackingFrameStats, char trackingClient[]);
-
-    bool sendWatermark;
   };
 
 };

common/rfb/Watermark.cxx

@@ -16,7 +16,6 @@
  * USA.
  */
 
-#include <math.h>
 #include <png.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +28,6 @@
 #include "font.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_GLYPH_H
 
 #include "Watermark.h"
 
@@ -189,149 +187,6 @@ static uint32_t drawnwidth(const char *txt) {
 	return x;
 }
 
-static void angle2mat(FT_Matrix &mat) {
-	const float angle = Server::DLP_WatermarkTextAngle / 360.f * 2 * -3.14159f;
-
-	mat.xx = (FT_Fixed)( cosf(angle) * 0x10000L);
-	mat.xy = (FT_Fixed)(-sinf(angle) * 0x10000L);
-	mat.yx = (FT_Fixed)( sinf(angle) * 0x10000L);
-	mat.yy = (FT_Fixed)( cosf(angle) * 0x10000L);
-}
-
-// Note: w and h are absolute
-static void angledstr(uint8_t *buf, const char *txt, const uint32_t x_, const uint32_t y_,
-		const uint32_t w, const uint32_t h,
-		const uint32_t stride, const bool invx, const bool invy) {
-
-	unsigned ucs[256], i, ucslen;
-	unsigned len = strlen(txt);
-	i = 0;
-	ucslen = 0;
-	while (len > 0 && txt[i]) {
-		size_t ret = rfb::utf8ToUCS4(&txt[i], len, &ucs[ucslen]);
-		i += ret;
-		len -= ret;
-		ucslen++;
-	}
-
-	FT_Matrix mat;
-	FT_Vector pen;
-
-	angle2mat(mat);
-
-	pen.x = 0;
-	pen.y = 0;
-
-	uint32_t x, y;
-
-	x = x_;
-	y = y_;
-	for (i = 0; i < ucslen; i++) {
-		FT_Set_Transform(face, &mat, &pen);
-
-		if (FT_Load_Char(face, ucs[i], FT_LOAD_RENDER))
-			continue;
-		const FT_Bitmap * const map = &(face->glyph->bitmap);
-
-		uint32_t row, col;
-		for (row = 0; row < (uint32_t) map->rows; row++) {
-			int ny = row + y - face->glyph->bitmap_top;
-			if (ny < 0)
-				continue;
-			if ((unsigned) ny >= h)
-				continue;
-
-			uint8_t *dst = (uint8_t *) buf;
-			dst += ny * stride + x;
-
-			const uint8_t *src = map->buffer + map->pitch * row;
-			for (col = 0; col < (uint32_t) map->width; col++) {
-				if (col + x >= w)
-					continue;
-				const uint8_t out = (src[col] + 8) >> 4;
-				dst[col] |= out < 16 ? out : 15;
-			}
-		}
-
-		x += face->glyph->advance.x >> 6;
-
-		pen.x += face->glyph->advance.x;
-		pen.y += face->glyph->advance.y;
-	}
-}
-
-static void angledsize(const char *txt, uint32_t &w, uint32_t &h,
-			uint32_t &recw, uint32_t &recy,
-			bool &invx, bool &invy) {
-
-	unsigned ucs[256], i, ucslen;
-	unsigned len = strlen(txt);
-	i = 0;
-	ucslen = 0;
-	while (len > 0 && txt[i]) {
-		size_t ret = rfb::utf8ToUCS4(&txt[i], len, &ucs[ucslen]);
-		i += ret;
-		len -= ret;
-		ucslen++;
-	}
-
-	FT_Matrix mat;
-	FT_Vector pen;
-
-	angle2mat(mat);
-
-	pen.x = 0;
-	pen.y = 0;
-
-	FT_BBox firstbox, lastbox;
-
-	for (i = 0; i < ucslen; i++) {
-		FT_Set_Transform(face, &mat, &pen);
-
-		if (FT_Load_Char(face, ucs[i], FT_LOAD_DEFAULT))
-			continue;
-
-		if (i == 0) {
-			FT_Glyph glyph;
-
-			FT_Get_Glyph(face->glyph, &glyph);
-			FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_PIXELS, &firstbox);
-			FT_Done_Glyph(glyph);
-
-			// recommended y; if the angle is steep enough, use the X bearing
-			#define EDGE 22
-			const int angle = abs(Server::DLP_WatermarkTextAngle);
-			if ((angle > (45 + EDGE) && angle < (135 - EDGE)) ||
-				(angle > (225 + EDGE) && angle < (315 - EDGE)))
-				recy = face->glyph->metrics.horiBearingX >> 6;
-			else
-				recy = face->glyph->metrics.horiBearingY >> 6;
-			#undef EDGE
-		} else if (i == ucslen - 1) {
-			FT_Glyph glyph;
-
-			FT_Get_Glyph(face->glyph, &glyph);
-			FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_PIXELS, &lastbox);
-			FT_Done_Glyph(glyph);
-		}
-
-		if (i != ucslen - 1) {
-			pen.x += face->glyph->advance.x;
-			pen.y += face->glyph->advance.y;
-		}
-	}
-
-	// recommended width, used when X is inverted
-	recw = face->size->metrics.max_advance >> 6;
-
-	// The used area is an union of first box, last box, and their relative distance
-	invx = pen.x < 0;
-	invy = pen.y > 0;
-
-	w = (firstbox.xMax - firstbox.xMin) + (lastbox.xMax - lastbox.xMin) + abs(pen.x >> 6);
-	h = (firstbox.yMax - firstbox.yMin) + (lastbox.yMax - lastbox.yMin) + abs(pen.y >> 6);
-}
-
 static bool drawtext(const char fmt[], const int16_t utcOff, const char fontpath[],
 			const uint8_t fontsize) {
 	char buf[PATH_MAX];
@@ -358,33 +213,14 @@ static bool drawtext(const char fmt[], const int16_t utcOff, const char fontpath
 		return false;
 
 	free(watermarkInfo.src);
-	if (Server::DLP_WatermarkTextAngle) {
+	const uint32_t h = fontsize + 4;
-		uint32_t w, h, recw, recy = fontsize;
+	const uint32_t w = drawnwidth(buf);
-		bool invx, invy;
-		angledsize(buf, w, h, recw, recy, invx, invy);
 
-		// The max is because a rotated text with the time can change size.
+	watermarkInfo.w = w;
-		// With the max op, at least it will only grow instead of bouncing.
+	watermarkInfo.h = h;
-		w = __rfbmax(w, watermarkInfo.w);
+	watermarkInfo.src = (uint8_t *) calloc(w, h);
-		h = __rfbmax(h, watermarkInfo.h);
 
-		watermarkInfo.w = w;
+	str(watermarkInfo.src, buf, 0, fontsize, w, h, w);
-		watermarkInfo.h = h;
-		watermarkInfo.src = (uint8_t *) calloc(w, h);
-
-		angledstr(watermarkInfo.src, buf,
-				invx ? w - recw: 0, invy ? h - recy : recy,
-				w, h, w, invx, invy);
-	} else {
-		const uint32_t h = fontsize + 4;
-		const uint32_t w = drawnwidth(buf);
-
-		watermarkInfo.w = w;
-		watermarkInfo.h = h;
-		watermarkInfo.src = (uint8_t *) calloc(w, h);
-
-		str(watermarkInfo.src, buf, 0, fontsize, w, h, w);
-	}
 
 	return true;
 }
@@ -443,31 +279,6 @@ bool watermarkInit() {
 	return true;
 }
 
-static void packWatermark() {
-	// Take the expanded 4-bit data, filter it by the changed rects, pack
-	// to shared bytes, and compress with zlib
-
-	uint16_t x, y;
-	uint8_t pix[2], cur = 0;
-	uint8_t *dst = watermarkTmp;
-
-	for (y = 0; y < rh; y++) {
-		for (x = 0; x < rw; x++) {
-			pix[cur] = watermarkUnpacked[y * rw + x];
-			if (cur || (y == rh - 1 && x == rw - 1))
-				*dst++ = pix[0] | (pix[1] << 4);
-
-			cur ^= 1;
-		}
-	}
-
-	uLong destLen = MAXW * MAXH / 2;
-	if (compress2(watermarkData, &destLen, watermarkTmp, rw * rh / 2 + 1, 1) != Z_OK)
-		vlog.error("Zlib compression error");
-
-	watermarkDataLen = destLen;
-}
-
 // update the screen-size rendered watermark whenever the screen is resized
 // or if using text, every frame
 void VNCServerST::updateWatermark() {
@@ -548,10 +359,48 @@ void VNCServerST::updateWatermark() {
 					rw - sx);
 		}
 	}
+}
 
-	packWatermark();
+void packWatermark(const Region &changed) {
+	// Take the expanded 4-bit data, filter it by the changed rects, pack
+	// to shared bytes, and compress with zlib
 
-	sendWatermark = true;
+	uint16_t x, y;
+	uint8_t pix[2], cur = 0;
+	uint8_t *dst = watermarkTmp;
+
+        const Rect &bounding = changed.get_bounding_rect();
+
+	for (y = 0; y < rh; y++) {
+		// Is the entire line outside the changed area?
+		if (bounding.tl.y > y || bounding.br.y < y) {
+			for (x = 0; x < rw; x++) {
+				pix[cur] = 0;
+
+				if (cur || (y == rh - 1 && x == rw - 1))
+					*dst++ = pix[0] | (pix[1] << 4);
+
+				cur ^= 1;
+			}
+		} else {
+			for (x = 0; x < rw; x++) {
+				pix[cur] = 0;
+				if (bounding.contains(Point(x, y)) && changed.contains(x, y))
+					pix[cur] = watermarkUnpacked[y * rw + x];
+
+				if (cur || (y == rh - 1 && x == rw - 1))
+					*dst++ = pix[0] | (pix[1] << 4);
+
+				cur ^= 1;
+			}
+		}
+	}
+
+	uLong destLen = MAXW * MAXH / 2;
+	if (compress2(watermarkData, &destLen, watermarkTmp, rw * rh / 2 + 1, 1) != Z_OK)
+		vlog.error("Zlib compression error");
+
+	watermarkDataLen = destLen;
 }
 
 // Limit changes to once per second
@@ -563,5 +412,5 @@ bool watermarkTextNeedsUpdate(const bool early) {
 	if (early)
 		now = time(NULL);
 
-	return now != lastUpdate && strchr(Server::DLP_WatermarkText, '%');
+	return now != lastUpdate;
 }

common/rfb/Watermark.h

@@ -35,6 +35,7 @@ struct watermarkInfo_t {
 extern watermarkInfo_t watermarkInfo;
 
 bool watermarkInit();
+void packWatermark(const rfb::Region &changed); // filter and pack the watermark for sending
 bool watermarkTextNeedsUpdate(const bool early);
 
 extern uint8_t *watermarkData;

debian/changelog

@@ -1,22 +1,9 @@
-kasmvnc (1.3.1-1) unstable; urgency=medium
+kasmvnc (1.2.1-1) unstable; urgency=medium
 
-  * Fix exception thrown on Firefox 124 and higher
+  * Fix exception with Firefox 124 and later
-  * Fix artifacts on high resolution secondary screens
+  * Fix bug with watermarking on odd resolutions
-  * Fixes for touch support on primary and secondary screens
-  * Fix for Oculus keyboard input
 
- -- Kasm Technologies LLC <info@kasmweb.com>  Mon, 12 Mar 2024 11:23:00 +0000
+ -- Kasm Technologies LLC <info@kasmweb.com>  Tue, 12 Mar 2023 11:38:00 +0000
-
-kasmvnc (1.3.0-1) unstable; urgency=medium
-
-  * Multi-monitor support.
-  * Increased performance with watermark enabled.
-  * Added support for Fedora 39 and Alpine 319.
-  * Allow special characters in usernames.
-  * Better logging of client settings when client connects or changes settings.
-  * Add support for rotation of text-based watermark.
-
- -- Kasm Technologies LLC <info@kasmweb.com>  Mon, 02 Feb 2024 14:33:00 +0000
 
 kasmvnc (1.2.0-1) unstable; urgency=medium
 

fedora/kasmvncserver.spec

@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.3.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser
 
@@ -83,18 +83,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md
 
 %changelog
-* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.3.1-1
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
-- Fix exception thrown on Firefox 124 and higher
+- Fix exception with Firefox 124 and later
-- Fix artifacts on high resolution secondary screens
+- Fix bug with watermarking on odd resolutions
-- Fixes for touch support on primary and secondary screens
-- Fix for Oculus keyboard input
-* Mon Feb 05 2024 KasmTech <info@kasmweb.com> - 1.3.0-1
-- Multi-monitor support.
-- Increased performance with watermark enabled.
-- Added support for Fedora 39 and Alpine 319.
-- Allow special characters in usernames.
-- Better logging of client settings when client connects or changes settings.
-- Add support for rotation of text-based watermark.
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-1
 - Add support for Unix relays for bidirectional communication between noVNC
   and containerized applications.

opensuse/kasmvncserver.spec

@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.3.1
+Version:        1.2.1
 Release:        leap15
 Summary:        VNC server accessible from a web browser
 
@@ -81,18 +81,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md
 
 %changelog
-* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.3.1-1
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
-- Fix exception thrown on Firefox 124 and higher
+- Fix exception with Firefox 124 and later
-- Fix artifacts on high resolution secondary screens
+- Fix bug with watermarking on odd resolutions
-- Fixes for touch support on primary and secondary screens
-- Fix for Oculus keyboard input
-* Mon Feb 05 2024 KasmTech <info@kasmweb.com> - 1.3.0-1
-- Multi-monitor support.
-- Increased performance with watermark enabled.
-- Added support for Fedora 39 and Alpine 319.
-- Allow special characters in usernames.
-- Better logging of client settings when client connects or changes settings.
-- Add support for rotation of text-based watermark.
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-leap15
 - Add support for Unix relays for bidirectional communication between noVNC
   and containerized applications.

oracle/kasmvncserver.spec

@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.3.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser
 
@@ -82,18 +82,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md
 
 %changelog
-* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.3.1-1
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
-- Fix exception thrown on Firefox 124 and higher
+- Fix exception with Firefox 124 and later
-- Fix artifacts on high resolution secondary screens
+- Fix bug with watermarking on odd resolutions
-- Fixes for touch support on primary and secondary screens
-- Fix for Oculus keyboard input
-* Mon Feb 05 2024 KasmTech <info@kasmweb.com> - 1.3.0-1
-- Multi-monitor support.
-- Increased performance with watermark enabled.
-- Added support for Fedora 39 and Alpine 319.
-- Allow special characters in usernames.
-- Better logging of client settings when client connects or changes settings.
-- Add support for rotation of text-based watermark.
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-1
 - Add support for Unix relays for bidirectional communication between noVNC
   and containerized applications.

oracle/kasmvncserver9.spec

@@ -1,5 +1,5 @@
 Name:           kasmvncserver
-Version:        1.3.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        VNC server accessible from a web browser
 
@@ -82,18 +82,9 @@ cd $DST_MAN && ln -s vncpasswd.1 kasmvncpasswd.1;
 %doc /usr/share/doc/kasmvncserver/README.md
 
 %changelog
-* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.3.1-1
+* Tue Mar 12 2024 KasmTech <info@kasmweb.com> - 1.2.1-1
-- Fix exception thrown on Firefox 124 and higher
+- Fix exception with Firefox 124 and later
-- Fix artifacts on high resolution secondary screens
+- Fix bug with watermarking on odd resolutions
-- Fixes for touch support on primary and secondary screens
-- Fix for Oculus keyboard input
-* Mon Feb 05 2024 KasmTech <info@kasmweb.com> - 1.3.0-1
-- Multi-monitor support.
-- Increased performance with watermark enabled.
-- Added support for Fedora 39 and Alpine 319.
-- Allow special characters in usernames.
-- Better logging of client settings when client connects or changes settings.
-- Add support for rotation of text-based watermark.
 * Fri Aug 25 2023 KasmTech <info@kasmweb.com> - 1.2.0-1
 - Add support for Unix relays for bidirectional communication between noVNC
   and containerized applications.

spec/fixtures/defaults_config.yaml

@@ -50,12 +50,6 @@ data_loss_prevention:
     # location: 10,10
     # tint: 255,20,20,128
     # repeat_spacing: 10
-    #text:
-      # template: "${USER} %H:%M"
-      # font: auto
-      # font_size: 48
-      # timezone_name: Australia/Adelaide
-      # angle: 0
   logging:
     level: off
 

unix/kasmvnc_defaults.yaml

@@ -100,7 +100,6 @@ data_loss_prevention:
       # font: auto
       # font_size: 48
       # timezone_name: Australia/Adelaide
-      # angle: 0
   logging:
     # "verbose" SETTING LOGS YOUR PRIVATE INFORMATION. Keypresses and clipboard content
     level: off

unix/kasmvncpasswd/kasmpasswd.h

@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 struct kasmpasswd_entry_t {
-	char user[128];
+	char user[32];
 	char password[128];
 	unsigned char read : 1;
 	unsigned char write : 1;

unix/vncserver

@@ -669,10 +669,9 @@ sub RunXstartup {
   DetectAndExportDisplay();
   $ENV{VNCDESKTOP}= $desktopName;
 
-  my $xstartupCmd = "{ echo 'Running $xstartupFile'; $xstartupFile; }";
   if ($opt{'-fg'}) {
     if (! $skipxstartup) {
-      system("$xstartupCmd >> " . quotedString($desktopLog) . " 2>&1");
+      system("$xstartupFile >> " . quotedString($desktopLog) . " 2>&1");
     }
     if (IsXvncRunning()) {
       $opt{'-kill'} = ':'.$displayNumber;
@@ -681,12 +680,12 @@ sub RunXstartup {
   } else {
     if ($opt{'-autokill'}) {
       if (! $skipxstartup) {
-        system("($xstartupCmd; $0 -kill :$displayNumber) >> "
+        system("($xstartupFile; $0 -kill :$displayNumber) >> "
           . quotedString($desktopLog) . " 2>&1 &");
       }
     } else {
       if (! $skipxstartup) {
-        system("$xstartupCmd >> " . quotedString($desktopLog)
+        system("$xstartupFile >> " . quotedString($desktopLog)
           . " 2>&1 &");
       }
     }
@@ -1862,24 +1861,6 @@ sub DefineConfigToCLIConversion {
           $offset_in_seconds/60;
         }
     }),
-    KasmVNC::CliOption->new({
-        name => 'DLP_WatermarkTextAngle',
-        configKeys => [
-          KasmVNC::ConfigKey->new({
-            name => "data_loss_prevention.watermark.text.angle",
-            validator => KasmVNC::CallbackValidator->new({
-              isValidCallback => sub {
-                my $value = shift;
-
-                return 0 unless $value =~ /^-?\d+$/;
-
-                $value >= -359 && $value <= 359;
-              },
-              errorMessage => "must be in range -359..359"
-            }),
-          })
-        ]
-    }),
     KasmVNC::CliOption->new({
         name => 'DLP_Log',
         configKeys => [

unix/vncserver.man

@@ -54,18 +54,11 @@ passed to Xvnc - see the Xvnc man page, or "Xvnc \-help", for details.
 
 .TP
 .B \-select-de [\fIde_name\fP]
-Select Desktop Enviromnent to run. Cinnamon, Mate, LXDE, LXQT, KDE, Gnome, XFCE,
+Select Desktop Enviromnent to run. Cinnamon, Mate, LXDE, LXQT, KDE, Gnome, XFCE
-are supported.
+are supported. If \fIde_name\fP isn't specified, a text UI prompt to select a
-
+Desktop Enviromnent will be shown.
-To trigger a text UI prompt to select a Desktop Enviromnent, run \fBvncserver\fP
-for the first time, or pass this option without arguments. To bypass the prompt,
-pass this option with the Desktop Enviromnent argument.
 Warning: $HOME/.vnc/xstartup will be overwritten.
 
-To run a custom setup (not one of the supported Desktop Enviromnents), create
-$HOME/.vnc/xstartup executable and specify \fB\-select-de manual\fP to signify you
-don't want its contents to be auto-generated.
-
 .TP
 .B \-geometry \fIwidth\fPx\fIheight\fP
 Specify the size of the VNC desktop to be created. Default is 1024x768.

unix/xserver/hw/vnc/Xvnc.man

@@ -384,10 +384,6 @@ Instead of an image, render this text as the watermark. Takes time formatting op
 for \fBstrftime\fP.
 .
 .TP
-.B \-DLP_WatermarkTextAngle \fIangle\fP
-Rotate the text by this many degrees, increasing clockwise. Default \fB0\fP.
-.
-.TP
 .B \-DLP_WatermarkFont \fI/path/to/font.ttf\fP
 Use a different font for -DLP_WatermarkText than the bundled one. TTF and OTF fonts
 are accepted.

unix/xserver/hw/vnc/xvnc.c

@@ -96,7 +96,7 @@ from the X Consortium.
 #include "version-config.h"
 #include "site.h"
 
-#define XVNCVERSION "KasmVNC 1.3.1"
+#define XVNCVERSION "KasmVNC 1.2.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")