Merge branch 'master' into 'release/1.3.2'

point noVNC to tip of 1.2.2 release See merge request kasm-technologies/internal/KasmVNC!143
point noVNC to tip of 1.2.2 release
2024-08-28 12:46:37 +00:00 · 2024-08-28 04:22:07 -05:00 · 2024-08-27 09:51:45 +00:00 · 2024-07-30 16:59:24 +00:00 · 2024-07-30 12:04:34 +00:00 · 2024-07-30 13:51:10 +03:00
46 changed files with 1301 additions and 162 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,12 +11,13 @@ 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: unix://
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_TLS_CERTDIR: ""

 workflow:
  rules:
    # Disable tag builds.
-    - if: $CI_COMMIT_TAG != $CI_COMMIT_REF_NAME
+    - if: $CI_COMMIT_TAG != $CI_COMMIT_REF_NAME && $CI_PIPELINE_SOURCE != "merge_request_event"

 stages:
  - www
@@ -38,11 +39,13 @@ stages:

 default:
  tags:
-    - oci-fixed-amd64
+    - oci-fixed-amd

 build_www:
  stage: www
  allow_failure: false
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
  script:
@@ -66,6 +69,8 @@ build_www:
 build_ubuntu_bionic:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -84,7 +89,7 @@ build_ubuntu_bionic_arm:
  stage: build
  allow_failure: false
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -102,6 +107,8 @@ build_ubuntu_bionic_arm:
 build_ubuntu_focal:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -120,7 +127,7 @@ build_ubuntu_focal_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -138,6 +145,8 @@ build_ubuntu_focal_arm:
 build_ubuntu_jammy:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -156,7 +165,7 @@ build_ubuntu_jammy_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -171,9 +180,49 @@ build_ubuntu_jammy_arm:
    paths:
      - output/

+build_ubuntu_noble:
+  stage: build
+  allow_failure: true
+  tags:
+    - oci-fixed-amd
+  before_script:
+    - *prepare_build
+    - *prepare_www
+  after_script:
+    - *prepare_artfacts
+  script:
+    - bash builder/build-package ubuntu noble;
+  only:
+    variables:
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+  artifacts:
+    paths:
+      - output/
+    
+build_ubuntu_noble_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 ubuntu noble;
+  only:
+    variables:
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+  artifacts:
+    paths:
+      - output/
+
 build_debian_buster:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -192,7 +241,7 @@ build_debian_buster_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -210,6 +259,8 @@ build_debian_buster_arm:
 build_debian_bullseye:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -228,7 +279,7 @@ build_debian_bullseye_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -247,6 +298,8 @@ build_debian_bullseye_arm:
 build_debian_bookworm:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -265,7 +318,7 @@ build_debian_bookworm_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -283,6 +336,8 @@ build_debian_bookworm_arm:
 build_kali_rolling:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -301,7 +356,7 @@ build_kali_rolling_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -319,6 +374,8 @@ build_kali_rolling_arm:
 build_centos7:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -336,6 +393,8 @@ build_centos7:
 build_oracle_8:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -354,7 +413,7 @@ build_oracle_8_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -372,6 +431,8 @@ build_oracle_8_arm:
 build_oracle_9:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -390,7 +451,7 @@ build_oracle_9_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -408,6 +469,8 @@ build_oracle_9_arm:
 build_opensuse_15:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -426,7 +489,7 @@ build_opensuse_15_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -444,6 +507,8 @@ build_opensuse_15_arm:
 build_fedora_thirtyseven:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -462,7 +527,7 @@ build_fedora_thirtyseven_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -480,6 +545,8 @@ build_fedora_thirtyseven_arm:
 build_fedora_thirtyeight:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -498,7 +565,7 @@ build_fedora_thirtyeight_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -513,9 +580,87 @@ 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_fedora_forty:
+  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 forty;
+  only:
+    variables:
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+  artifacts:
+    paths:
+      - output/
+    
+build_fedora_forty_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 forty;
+  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
@@ -534,7 +679,7 @@ build_alpine_317_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -551,6 +696,8 @@ build_alpine_317_arm:

 test:
  stage: test
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
  script:
@@ -560,6 +707,8 @@ test:
 build_alpine_318:
  stage: build
  allow_failure: true
+  tags:
+    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@@ -578,7 +727,7 @@ build_alpine_318_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm64
+    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@@ -593,9 +742,87 @@ 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/
+
+build_alpine_320:
+  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 320;
+  only:
+    variables:
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+  artifacts:
+    paths:
+      - output/
+
+build_alpine_320_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 320;
+  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/
@@ -633,6 +860,8 @@ upload_build_preview:
  needs: ["upload"]
  dependencies: ["upload"]
  image: ubuntu:focal
+  tags:
+    - oci-fixed-amd
  before_script:
    - . .ci/upload.sh
  resource_group: upload_build_preview
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = master
+	branch = release/1.2.2
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 KasmVNC provides remote web-based access to a Desktop or application. While VNC is in the name, KasmVNC differs from other VNC variants such as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB specification which defines VNC, in order to support modern technologies and increase security. KasmVNC is accessed by users from any modern browser and does not support legacy VNC viewer applications. KasmVNC uses a modern YAML based configuration at the server and user level, allowing for ease of management.

-[Kasm Technologies](https://www.kasmweb.com) developed Kasm Workspaces, the Containerized Streaming Platform. Kasm has open-sourced the Workspace docker images, which include containerized [full desktops and apps](https://github.com/kasmtech/workspaces-images) and [base images](https://github.com/kasmtech/workspaces-core-images) intended for developers to create custimized streaming containers. These containers can be used standalone or within the [Kasm Workspaces Platform](https://www.kasmweb.com) which provides a full Enterprise feature set.
+[Kasm Technologies](https://www.kasmweb.com) developed Kasm Workspaces, the Containerized Streaming Platform. Kasm has open-sourced the Workspace docker images, which include containerized [full desktops and apps](https://github.com/kasmtech/workspaces-images) and [base images](https://github.com/kasmtech/workspaces-core-images) intended for developers to create customized streaming containers. These containers can be used standalone or within the [Kasm Workspaces Platform](https://www.kasmweb.com) which provides a full Enterprise feature set.

 ## Documentation

@@ -27,7 +27,7 @@ wget <package_url>
 sudo apt-get install ./kasmvncserver_*.deb

 # Add your user to the ssl-cert group
-sudo addgroup $USER ssl-cert
+sudo adduser $USER ssl-cert
 ```

 ### Oracle 8
@@ -269,4 +269,4 @@ Future Goals:
 See the [builder/README.md](https://github.com/kasmtech/KasmVNC/blob/master/builder/README.md). We containerize our build systems to ensure highly repeatable builds.

 ### License and Acknowledgements
-See the [LICENSE.TXT](https://github.com/kasmtech/KasmVNC/blob/master/LICENSE.TXT) and [ACKNOWLEDGEMENTS.MD](https://github.com/kasmtech/KasmVNC/blob/master/LICENSE.TXT)
+See the [LICENSE.TXT](https://github.com/kasmtech/KasmVNC/blob/master/LICENSE.TXT) and [ACKNOWLEDGEMENTS.md](https://github.com/kasmtech/KasmVNC/blob/master/ACKNOWLEDGEMENTS.md)
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -139,6 +139,8 @@ if [ -d /usr/lib/x86_64-linux-gnu/dri ]; then
  ln -s /usr/lib/x86_64-linux-gnu/dri dri
 elif [ -d /usr/lib/aarch64-linux-gnu/dri ]; then
  ln -s /usr/lib/aarch64-linux-gnu/dri dri
+elif [ -d /usr/lib/arm-linux-gnueabihf/dri ]; then
+  ln -s /usr/lib/arm-linux-gnueabihf/dri dri
 elif [ -d /usr/lib/xorg/modules/dri ]; then
  ln -s /usr/lib/xorg/modules/dri dri
 else
--- a/builder/dockerfile.alpine_319.apk.build
+++ b/builder/dockerfile.alpine_319.apk.build
@@ -0,0 +1,7 @@
+FROM alpine:3.19
+
+RUN apk add shadow bash
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+USER docker
--- a/builder/dockerfile.alpine_319.build
+++ b/builder/dockerfile.alpine_319.build
@@ -0,0 +1,82 @@
+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"]
--- a/builder/dockerfile.alpine_320.apk.build
+++ b/builder/dockerfile.alpine_320.apk.build
@@ -0,0 +1,7 @@
+FROM alpine:3.20
+
+RUN apk add shadow bash
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+USER docker
--- a/builder/dockerfile.alpine_320.build
+++ b/builder/dockerfile.alpine_320.build
@@ -0,0 +1,82 @@
+FROM alpine:3.20
+
+ENV KASMVNC_BUILD_OS alpine
+ENV KASMVNC_BUILD_OS_CODENAME 320
+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"]
--- a/builder/dockerfile.fedora_forty.build
+++ b/builder/dockerfile.fedora_forty.build
@@ -0,0 +1,86 @@
+FROM fedora:40
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME forty
+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"]
--- a/builder/dockerfile.fedora_forty.rpm.build
+++ b/builder/dockerfile.fedora_forty.rpm.build
@@ -0,0 +1,13 @@
+FROM fedora:40
+
+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
--- a/builder/dockerfile.fedora_thirtynine.build
+++ b/builder/dockerfile.fedora_thirtynine.build
@@ -0,0 +1,86 @@
+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"]
--- a/builder/dockerfile.fedora_thirtynine.rpm.build
+++ b/builder/dockerfile.fedora_thirtynine.rpm.build
@@ -0,0 +1,13 @@
+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
--- a/builder/dockerfile.oracle_9.rpm.build
+++ b/builder/dockerfile.oracle_9.rpm.build
@@ -4,8 +4,8 @@ ENV KASMVNC_BUILD_OS oracle
 ENV KASMVNC_BUILD_OS_CODENAME 9

 RUN dnf config-manager --set-enabled ol9_codeready_builder
-RUN dnf config-manager --set-enabled ol9_distro_builder
-RUN dnf install -y \
+RUN dnf config-manager --nobest --set-enabled ol9_distro_builder
+RUN dnf install --nobest -y \
  gpg* \
  less \
  redhat-lsb-core \
--- a/builder/dockerfile.ubuntu_noble.build
+++ b/builder/dockerfile.ubuntu_noble.build
@@ -0,0 +1,28 @@
+FROM ubuntu:noble
+
+ENV KASMVNC_BUILD_OS ubuntu
+ENV KASMVNC_BUILD_OS_CODENAME noble
+ENV XORG_VER 1.20.8
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN sed -i 's$Types: deb$Types: deb deb-src$' /etc/apt/sources.list.d/ubuntu.sources
+
+RUN apt-get update && \
+      apt-get -y install sudo
+
+RUN apt-get update && apt-get install -y --no-install-recommends tzdata
+RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
+RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget curl
+RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
+
+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 && adduser docker sudo
+
+COPY --chown=docker:docker . /src/
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_noble.deb.build
+++ b/builder/dockerfile.ubuntu_noble.deb.build
@@ -0,0 +1,19 @@
+FROM ubuntu:noble
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && \
+      apt-get -y install vim build-essential devscripts equivs
+
+# Install build-deps for the package.
+COPY ./debian/control /tmp
+RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
+
+ARG L_UID
+RUN if [ "$L_UID" -eq 0 ]; then \
+      useradd -m docker; \
+    else \
+      useradd -m docker -u $L_UID;\
+    fi
+
+USER docker
--- a/builder/dockerfile.ubuntu_noble.deb.test
+++ b/builder/dockerfile.ubuntu_noble.deb.test
@@ -0,0 +1,57 @@
+FROM ubuntu:noble
+
+ENV DISPLAY=:1 \
+    VNC_PORT=8443 \
+    VNC_RESOLUTION=1280x720 \
+    MAX_FRAME_RATE=24 \
+    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
+    HOME=/home/user \
+    TERM=xterm \
+    STARTUPDIR=/dockerstartup \
+    INST_SCRIPTS=/dockerstartup/install \
+    KASM_RX_HOME=/dockerstartup/kasmrx \
+    DEBIAN_FRONTEND=noninteractive \
+    VNC_COL_DEPTH=24 \
+    VNC_RESOLUTION=1280x1024 \
+    VNC_PW=vncpassword \
+    VNC_USER=user \
+    VNC_VIEW_ONLY_PW=vncviewonlypassword \
+    LD_LIBRARY_PATH=/usr/local/lib/ \
+    OMP_WAIT_POLICY=PASSIVE \
+    SHELL=/bin/bash \
+    SINGLE_APPLICATION=0 \
+    KASMVNC_BUILD_OS=ubuntu \
+    KASMVNC_BUILD_OS_CODENAME=noble
+
+EXPOSE $VNC_PORT
+
+WORKDIR $HOME
+
+### REQUIRED STUFF ###
+
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get purge -y pm-utils xscreensaver*
+RUN apt-get update && apt-get install -y vim less
+RUN apt-get update && apt-get -y install lsb-release
+
+RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
+
+RUN mkdir -p $STARTUPDIR
+COPY builder/startup/ $STARTUPDIR
+
+### START CUSTOM STUFF ####
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
+RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+### END CUSTOM STUFF ###
+
+RUN chown -R 1000:0 $HOME
+USER 1000:ssl-cert
+WORKDIR $HOME
+
+ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.ubuntu_noble.test
+++ b/builder/dockerfile.ubuntu_noble.test
@@ -0,0 +1,51 @@
+FROM ubuntu:noble
+
+ENV DISPLAY=:1 \
+    VNC_PORT=8443 \
+    VNC_RESOLUTION=1280x720 \
+    MAX_FRAME_RATE=24 \
+    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
+    HOME=/home/user \
+    TERM=xterm \
+    STARTUPDIR=/dockerstartup \
+    INST_SCRIPTS=/dockerstartup/install \
+    KASM_RX_HOME=/dockerstartup/kasmrx \
+    DEBIAN_FRONTEND=noninteractive \
+    VNC_COL_DEPTH=24 \
+    VNC_RESOLUTION=1280x1024 \
+    VNC_PW=vncpassword \
+    VNC_USER=user \
+    VNC_VIEW_ONLY_PW=vncviewonlypassword \
+    LD_LIBRARY_PATH=/usr/local/lib/ \
+    OMP_WAIT_POLICY=PASSIVE \
+    SHELL=/bin/bash \
+    SINGLE_APPLICATION=0 \
+    KASMVNC_BUILD_OS=ubuntu \
+    KASMVNC_BUILD_OS_CODENAME=noble
+
+EXPOSE $VNC_PORT
+
+WORKDIR $HOME
+
+### REQUIRED STUFF ###
+
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get purge -y pm-utils xscreensaver*
+
+RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
+
+RUN mkdir -p $STARTUPDIR
+COPY startup/ $STARTUPDIR
+
+### START CUSTOM STUFF ####
+
+COPY build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz /tmp/
+RUN tar -xzvf /tmp/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz --strip 1 -C /
+
+### END CUSTOM STUFF ###
+
+RUN chown -R 1000:0 $HOME
+USER 1000
+WORKDIR $HOME
+
+ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/startup/deb/select-de.sh
+++ b/builder/startup/deb/select-de.sh
@@ -198,6 +198,7 @@ generate_xstartup() {

  cat <<-SCRIPT > "$xstartup_script"
 #!/bin/sh
+set -x
 $de_cmd
 SCRIPT
  chmod +x "$xstartup_script"
--- a/common/network/GetAPIMessager.cxx
+++ b/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 = strchr(id, '@');
+		const char *at = strrchr(id, '@');
 		if (!at)
 			continue;

--- a/common/network/Udp.cxx
+++ b/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", 1300, 500, 1400);
+rfb::IntParameter udpSize("udpSize", "UDP packet data size", 1296, 500, 1400);

 extern settings_t settings;

@@ -95,10 +95,11 @@ 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) * 4];
+	uint8_t buf[1400 + sizeof(uint32_t) * 5];
 	const uint32_t pieces = (len / DATA_MAX) + ((len % DATA_MAX) ? 1 : 0);

 	uint32_t i;
@@ -111,12 +112,13 @@ 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[16], data, curlen);
+		memcpy(&buf[20], data, curlen);
 		data += curlen;
 		len -= curlen;

-		if (WuHostSendBinary(host, client, buf, curlen + sizeof(uint32_t) * 4) < 0)
+		if (WuHostSendBinary(host, client, buf, curlen + sizeof(uint32_t) * 5) < 0)
 			return 1;
 	}

@@ -125,7 +127,8 @@ 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;

@@ -137,7 +140,7 @@ void UdpStream::flush() {
 	total_len += len;

 	if (client) {
-		if (udpsend(client, data, len, &id)) {
+		if (udpsend(client, data, len, &id, &frame)) {
 			vlog.error("Error sending udp, client gone?");
 			failed = true;
 		}
--- a/common/network/Udp.h
+++ b/common/network/Udp.h
@@ -40,6 +40,10 @@ namespace network {
 				client = cli;
 			}

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

--- a/common/network/websocket.c
+++ b/common/network/websocket.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
+#include <inttypes.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -33,7 +34,6 @@
 #include <openssl/sha.h> /* sha1 hash */
 #include "websocket.h"
 #include "jsonescape.h"
-#include "kasmpasswd.h"
 #include <network/Blacklist.h>

 /*
@@ -783,6 +783,10 @@ static const char *name2mime(const char *name) {
        goto def;
    end++;

+    // Everything under Downloads/ should be treated as binary
+    if (strcasestr(name, "Downloads/"))
+        goto def;
+
    #define CMP(s) if (!strncmp(end, s, sizeof(s) - 1))

    CMP("htm")
@@ -918,6 +922,12 @@ static void servefile(ws_ctx_t *ws_ctx, const char *in, const char * const user,

    percent_decode(path, buf, 1);

+    // in case they percent-encoded dots
+    if (strstr(buf, "../")) {
+        handler_msg("Attempted dir traversal attack, rejecting\n", len);
+        goto nope;
+    }
+
    handler_msg("Requested file '%s'\n", buf);
    sprintf(fullpath, "%s/%s", settings.httpdir, buf);

@@ -934,15 +944,15 @@ static void servefile(ws_ctx_t *ws_ctx, const char *in, const char * const user,
        goto nope;
    }

-    fseek(f, 0, SEEK_END);
-    const uint64_t filesize = ftell(f);
+    fseeko(f, 0, SEEK_END);
+    const uint64_t filesize = ftello(f);
    rewind(f);

    sprintf(buf, "HTTP/1.1 200 OK\r\n"
                 "Server: KasmVNC/4.0\r\n"
                 "Connection: close\r\n"
                 "Content-type: %s\r\n"
-                 "Content-length: %lu\r\n"
+                 "Content-length: %" PRIu64 "\r\n"
                 "%s"
                 "\r\n",
                 name2mime(path), filesize, extra_headers ? extra_headers : "");
@@ -1019,6 +1029,20 @@ static void send403(ws_ctx_t *ws_ctx, const char * const origip, const char * co
    weblog(403, wsthread_handler_id, 0, origip, ip, "-", 1, "-", strlen(buf));
 }

+static void send400(ws_ctx_t *ws_ctx, const char * const origip, const char * const ip,
+                    const char *info) {
+    char buf[4096];
+    sprintf(buf, "HTTP/1.1 400 Bad Request\r\n"
+                 "Server: KasmVNC/4.0\r\n"
+                 "Connection: close\r\n"
+                 "Content-type: text/plain\r\n"
+                 "%s"
+                 "\r\n"
+                 "400 Bad Request%s", extra_headers ? extra_headers : "", info);
+    ws_send(ws_ctx, buf, strlen(buf));
+    weblog(400, wsthread_handler_id, 0, origip, ip, "-", 1, "-", strlen(buf));
+}
+
 static uint8_t ownerapi_post(ws_ctx_t *ws_ctx, const char *in, const char * const user,
                             const char * const ip, const char * const origip) {
    char buf[4096], path[4096];
@@ -1645,7 +1669,7 @@ timeout:
 }

 ws_ctx_t *do_handshake(int sock, char * const ip) {
-    char handshake[4096], response[4096], sha1[29], trailer[17];
+    char handshake[16 * 1024], response[4096], sha1[29], trailer[17];
    char *scheme, *pre;
    headers_t *headers;
    int len, i, offset;
@@ -1702,6 +1726,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
            break;
        } else if (sizeof(handshake) <= (size_t)(offset + 1)) {
            handler_emsg("Oversized handshake\n");
+            send400(ws_ctx, "-", ip, ", too large");
            free_ws_ctx(ws_ctx);
            return NULL;
        } else if (9 == i) {
@@ -1756,7 +1781,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
    }

    unsigned char owner = 0;
-    char inuser[32] = "-";
+    char inuser[USERNAME_LEN] = "-";
    if (!settings.disablebasicauth) {
        const char *hdr = strstr(handshake, "Authorization: Basic ");
        if (!hdr) {
@@ -1794,7 +1819,7 @@ ws_ctx_t *do_handshake(int sock, char * const ip) {
        if (resppw && *resppw)
            resppw++;
        if (settings.passwdfile) {
-            if (resppw && *resppw && resppw - response < 32) {
+            if (resppw && *resppw && resppw - response < USERNAME_LEN + 1) {
                char pwbuf[4096];
                struct kasmpasswd_t *set = readkasmpasswd(settings.passwdfile);
                if (!set->num) {
--- a/common/network/websocket.h
+++ b/common/network/websocket.h
@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include "GetAPIEnums.h"
 #include "datelog.h"
+#include "kasmpasswd.h"

 #define BUFSIZE 65536
 #define DBUFSIZE (BUFSIZE * 3) / 4 - 20
@@ -57,7 +58,7 @@ typedef struct {
    char      *tin_buf;
    char      *tout_buf;

-    char      user[32];
+    char      user[USERNAME_LEN];
    char      ip[64];
 } ws_ctx_t;

--- a/common/rfb/ConnParams.cxx
+++ b/common/rfb/ConnParams.cxx
@@ -24,6 +24,7 @@
 #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>
@@ -32,6 +33,19 @@

 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),
@@ -147,54 +161,71 @@ 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;
@@ -215,8 +246,12 @@ 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)
@@ -225,57 +260,133 @@ 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)
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -363,6 +363,9 @@ 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])
@@ -420,9 +423,6 @@ 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) {
+    if (watermarkData && conn->sendWatermark()) {
      beforeLength = conn->getOutStream(conn->cp.supportsUdp)->length();

      const Rect rect(0, 0, pb->width(), pb->height());
--- a/common/rfb/SConnection.h
+++ b/common/rfb/SConnection.h
@@ -198,6 +198,10 @@ namespace rfb {
        std::vector<unsigned char> data;
    };

+    virtual bool sendWatermark() const {
+        return false;
+    }
+
  protected:
    void setState(stateEnum s) { state_ = s; }

--- a/common/rfb/SMsgReader.cxx
+++ b/common/rfb/SMsgReader.cxx
@@ -171,6 +171,9 @@ 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);
  }
 }

--- a/common/rfb/SMsgWriter.cxx
+++ b/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), nRectsInHeader(0),
+    nRectsInUpdate(0), dataRectsInUpdate(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 = 0;
+  nRectsInUpdate = dataRectsInUpdate = 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(0);
+      udps->writeS16(dataRectsInUpdate);
      udps->writeS16(0);
      udps->writeU16(0);
      udps->writeU16(0);
@@ -394,6 +394,7 @@ 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);
--- a/common/rfb/SMsgWriter.h
+++ b/common/rfb/SMsgWriter.h
@@ -165,6 +165,7 @@ namespace rfb {
    rdr::OutStream* udps;

    int nRectsInUpdate;
+    int dataRectsInUpdate;
    int nRectsInHeader;

    bool needSetDesktopSize;
--- a/common/rfb/ServerCore.cxx
+++ b/common/rfb/ServerCore.cxx
@@ -201,6 +201,10 @@ 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",
--- a/common/rfb/ServerCore.h
+++ b/common/rfb/ServerCore.h
@@ -52,6 +52,7 @@ 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;
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -88,8 +88,8 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
  wordfree(&wexp);

  user[0] = '\0';
-  const char *at = strchr(peerEndpoint.buf, '@');
-  if (at && at - peerEndpoint.buf > 1 && at - peerEndpoint.buf < 32) {
+  const char *at = strrchr(peerEndpoint.buf, '@');
+  if (at && at - peerEndpoint.buf > 1 && at - peerEndpoint.buf < USERNAME_LEN) {
    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)) 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[])
@@ -1635,7 +1643,7 @@ void VNCSConnectionST::sendStats(const bool toClient) {
 void VNCSConnectionST::handleFrameStats(rdr::U32 all, rdr::U32 render)
 {
  if (server->apimessager) {
-    const char *at = strchr(peerEndpoint.buf, '@');
+    const char *at = strrchr(peerEndpoint.buf, '@');
    if (!at)
      at = peerEndpoint.buf;
    else
--- a/common/rfb/VNCSConnectionST.h
+++ b/common/rfb/VNCSConnectionST.h
@@ -35,6 +35,8 @@
 #include <rfb/Timer.h>
 #include <rfb/unixRelayLimits.h>

+#include "kasmpasswd.h"
+
 namespace rfb {
  class VNCServerST;

@@ -213,6 +215,10 @@ namespace rfb {
    virtual void sendUnixRelayData(const char name[], const unsigned char *buf,
                                   const unsigned len);

+    bool sendWatermark() const {
+        return server->sendWatermark;
+    }
+
  private:
    // SConnection callbacks

@@ -318,7 +324,7 @@ namespace rfb {
    rdr::U64 bstats_total[BS_NUM];
    struct timeval connStart;

-    char user[32];
+    char user[USERNAME_LEN];
    char kasmpasswdpath[4096];
    bool needsPermCheck;

--- a/common/rfb/VNCServerST.cxx
+++ b/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)
+    clipboardId(0), sendWatermark(false)
 {
  lastUserInputTime = lastDisconnectTime = time(0);
  slog.debug("creating single-threaded server %s", name.buf);
@@ -223,6 +223,9 @@ VNCServerST::VNCServerST(const char* name_, SDesktop* desktop_)

  trackingClient[0] = 0;

+  if (watermarkData)
+    sendWatermark = true;
+
  if (Server::selfBench)
    SelfBench();
 }
@@ -279,6 +282,9 @@ 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) {
@@ -814,7 +820,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 = strchr(who, '@');
+    const char *start = strrchr(who, '@');
    if (!start)
      continue;
    start++;
@@ -975,8 +981,8 @@ void VNCServerST::writeUpdate()
  }

  if (watermarkData && Server::DLP_WatermarkText[0] && watermarkTextNeedsUpdate(true)) {
-    // If using a text watermark, we have to mark everything as changed...
-    refreshClients();
+    // The text may have changed
+    sendWatermark = true;
  }

  comparer->getUpdateInfo(&ui, pb->getRect());
@@ -1104,6 +1110,8 @@ void VNCServerST::writeUpdate()
    }
  }

+  sendWatermark = false; // the client now caches it, only send once
+
  if (trackingFrameStats) {
    if (enctime) {
      const unsigned totalMs = msSince(&start);
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -290,6 +290,8 @@ namespace rfb {

    void checkAPIMessages(network::GetAPIMessager *apimessager,
                          rdr::U8 &trackingFrameStats, char trackingClient[]);
+
+    bool sendWatermark;
  };

 };
--- a/common/rfb/Watermark.cxx
+++ b/common/rfb/Watermark.cxx
@@ -16,6 +16,7 @@
 * USA.
 */

+#include <math.h>
 #include <png.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,6 +29,7 @@
 #include "font.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_GLYPH_H

 #include "Watermark.h"

@@ -187,6 +189,149 @@ 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];
@@ -213,14 +358,33 @@ static bool drawtext(const char fmt[], const int16_t utcOff, const char fontpath
 		return false;

 	free(watermarkInfo.src);
-	const uint32_t h = fontsize + 4;
-	const uint32_t w = drawnwidth(buf);
+	if (Server::DLP_WatermarkTextAngle) {
+		uint32_t w, h, recw, recy = fontsize;
+		bool invx, invy;
+		angledsize(buf, w, h, recw, recy, invx, invy);

-	watermarkInfo.w = w;
-	watermarkInfo.h = h;
-	watermarkInfo.src = (uint8_t *) calloc(w, h);
+		// The max is because a rotated text with the time can change size.
+		// With the max op, at least it will only grow instead of bouncing.
+		w = __rfbmax(w, watermarkInfo.w);
+		h = __rfbmax(h, watermarkInfo.h);

-	str(watermarkInfo.src, buf, 0, fontsize, w, h, w);
+		watermarkInfo.w = 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;
 }
@@ -279,6 +443,31 @@ 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() {
@@ -359,48 +548,10 @@ void VNCServerST::updateWatermark() {
 					rw - sx);
 		}
 	}
-}

-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
+	packWatermark();

-	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;
+	sendWatermark = true;
 }

 // Limit changes to once per second
@@ -412,5 +563,5 @@ bool watermarkTextNeedsUpdate(const bool early) {
 	if (early)
 		now = time(NULL);

-	return now != lastUpdate;
+	return now != lastUpdate && strchr(Server::DLP_WatermarkText, '%');
 }
--- a/common/rfb/Watermark.h
+++ b/common/rfb/Watermark.h
@@ -35,7 +35,6 @@ 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;
--- a/2
+++ b/2
--- a/spec/fixtures/defaults_config.yaml
+++ b/spec/fixtures/defaults_config.yaml
@@ -50,6 +50,12 @@ 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

--- a/unix/kasmvnc_defaults.yaml
+++ b/unix/kasmvnc_defaults.yaml
@@ -100,6 +100,7 @@ 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
--- a/unix/kasmvncpasswd/kasmpasswd.h
+++ b/unix/kasmvncpasswd/kasmpasswd.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif

 struct kasmpasswd_entry_t {
-	char user[32];
+	char user[128];
 	char password[128];
 	unsigned char read : 1;
 	unsigned char write : 1;
--- a/unix/kasmxproxy/kasmxproxy.c
+++ b/unix/kasmxproxy/kasmxproxy.c
@@ -520,6 +520,8 @@ int main(int argc, char **argv) {
 			cursorhash = newhash;
 		}

+		XFree(cursor);
+
 		usleep(sleeptime);
 	}

--- a/unix/vncserver
+++ b/unix/vncserver
@@ -669,9 +669,10 @@ sub RunXstartup {
  DetectAndExportDisplay();
  $ENV{VNCDESKTOP}= $desktopName;

+  my $xstartupCmd = "{ echo 'Running $xstartupFile'; $xstartupFile; }";
  if ($opt{'-fg'}) {
    if (! $skipxstartup) {
-      system("$xstartupFile >> " . quotedString($desktopLog) . " 2>&1");
+      system("$xstartupCmd >> " . quotedString($desktopLog) . " 2>&1");
    }
    if (IsXvncRunning()) {
      $opt{'-kill'} = ':'.$displayNumber;
@@ -680,12 +681,12 @@ sub RunXstartup {
  } else {
    if ($opt{'-autokill'}) {
      if (! $skipxstartup) {
-        system("($xstartupFile; $0 -kill :$displayNumber) >> "
+        system("($xstartupCmd; $0 -kill :$displayNumber) >> "
          . quotedString($desktopLog) . " 2>&1 &");
      }
    } else {
      if (! $skipxstartup) {
-        system("$xstartupFile >> " . quotedString($desktopLog)
+        system("$xstartupCmd >> " . quotedString($desktopLog)
          . " 2>&1 &");
      }
    }
@@ -1861,6 +1862,24 @@ 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 => [
--- a/unix/vncserver.man
+++ b/unix/vncserver.man
@@ -43,9 +43,9 @@ vncserver :13
 .RE

 vncserver can detect desktop environments and prompt the user to select one to
-start with the session. The user can also manually edit the file 
-$HOME/.vnc/xstartup to customize what commands should be run on startup of a 
-new session. 
+start with the session. The user can also manually edit the file
+$HOME/.vnc/xstartup to customize what commands should be run on startup of a
+new session.

 .SH OPTIONS
 You can get a list of options by passing \fB\-h\fP as an option to vncserver.
@@ -54,11 +54,18 @@ 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
-are supported. If \fIde_name\fP isn't specified, a text UI prompt to select a
-Desktop Enviromnent will be shown.
+Select Desktop Enviromnent to run. Cinnamon, Mate, LXDE, LXQT, KDE, Gnome, XFCE,
+are supported.
+
+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.
--- a/unix/xserver/hw/vnc/Xvnc.man
+++ b/unix/xserver/hw/vnc/Xvnc.man
@@ -384,6 +384,10 @@ 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.
--- a/unix/xserver/hw/vnc/dri3.c
+++ b/unix/xserver/hw/vnc/dri3.c
@@ -55,9 +55,12 @@ typedef struct gbm_pixmap gbm_pixmap;
 static DevPrivateKeyRec dri3_pixmap_private_key;
 static struct timeval start;

-#define MAX_TEXPIXMAPS 32
-static PixmapPtr texpixmaps[MAX_TEXPIXMAPS];
-static uint32_t num_texpixmaps;
+struct texpixmap {
+    PixmapPtr pixmap;
+    struct xorg_list entry;
+};
+
+static struct xorg_list texpixmaps;
 static CARD32 update_texpixmaps(OsTimerPtr timer, CARD32 time, void *arg);
 static OsTimerPtr texpixmaptimer;

@@ -110,25 +113,21 @@ static gbm_pixmap *gbm_pixmap_get(PixmapPtr pixmap)

 static void add_texpixmap(PixmapPtr pix)
 {
-    uint32_t i;
-    for (i = 0; i < MAX_TEXPIXMAPS; i++) {
-        if (texpixmaps[i] == pix)
+    struct texpixmap *ptr;
+
+    xorg_list_for_each_entry(ptr, &texpixmaps, entry) {
+        if (ptr->pixmap == pix)
            return;
    }

-    for (i = 0; i < MAX_TEXPIXMAPS; i++) {
-        if (!texpixmaps[i]) {
-            texpixmaps[i] = pix;
-            pix->refcnt++;
-            num_texpixmaps++;
-            // start if not running
-            if (!texpixmaptimer)
-                texpixmaptimer = TimerSet(NULL, 0, 16, update_texpixmaps, NULL);
-            return;
-        }
-    }
+    ptr = calloc(1, sizeof(struct texpixmap));
+    ptr->pixmap = pix;
+    pix->refcnt++;
+    xorg_list_append(&ptr->entry, &texpixmaps);

-    ErrorF("Max number of texpixmaps reached\n");
+    // start if not running
+    if (!texpixmaptimer)
+        texpixmaptimer = TimerSet(NULL, 0, 16, update_texpixmaps, NULL);
 }

 static PixmapPtr
@@ -313,38 +312,41 @@ void xvnc_sync_dri3_textures(void)
    // This is called both from the global damage report and the timer,
    // to account for cases that do not use the damage report.

-    uint32_t i, y;
+    uint32_t y;
    gbm_pixmap *gp;
    uint8_t *src, *dst;
    uint32_t srcstride, dststride;
    void *opaque = NULL;
+    struct texpixmap *ptr, *tmpptr;

-    for (i = 0; i < MAX_TEXPIXMAPS; i++) {
-        if (!texpixmaps[i])
-            continue;
-        if (texpixmaps[i]->refcnt == 1) {
+    // We may not be running on hw if there's a compositor using PRESENT on llvmpipe
+    if (!driNode)
+        return;
+
+    xorg_list_for_each_entry_safe(ptr, tmpptr, &texpixmaps, entry) {
+        if (ptr->pixmap->refcnt == 1) {
            // We are the only user left, delete it
-            texpixmaps[i]->drawable.pScreen->DestroyPixmap(texpixmaps[i]);
-            texpixmaps[i] = NULL;
-            num_texpixmaps--;
+            ptr->pixmap->drawable.pScreen->DestroyPixmap(ptr->pixmap);
+            xorg_list_del(&ptr->entry);
+            free(ptr);
            continue;
        }

-        gp = gbm_pixmap_get(texpixmaps[i]);
+        gp = gbm_pixmap_get(ptr->pixmap);
        opaque = NULL;
        dst = gbm_bo_map(gp->bo, 0, 0,
-                         texpixmaps[i]->drawable.width,
-                         texpixmaps[i]->drawable.height,
+                         ptr->pixmap->drawable.width,
+                         ptr->pixmap->drawable.height,
                         GBM_BO_TRANSFER_WRITE, &dststride, &opaque);
        if (!dst) {
            ErrorF("gbm map failed, errno %d\n", errno);
            continue;
        }

-        srcstride = texpixmaps[i]->devKind;
-        src = texpixmaps[i]->devPrivate.ptr;
+        srcstride = ptr->pixmap->devKind;
+        src = ptr->pixmap->devPrivate.ptr;

-        for (y = 0; y < texpixmaps[i]->drawable.height; y++) {
+        for (y = 0; y < ptr->pixmap->drawable.height; y++) {
            memcpy(dst, src, srcstride);
            dst += dststride;
            src += srcstride;
@@ -358,7 +360,7 @@ static CARD32 update_texpixmaps(OsTimerPtr timer, CARD32 time, void *arg)
 {
    xvnc_sync_dri3_textures();

-    if (!num_texpixmaps) {
+    if (xorg_list_is_empty(&texpixmaps)) {
        TimerFree(texpixmaptimer);
        texpixmaptimer = NULL;
        return 0;
@@ -387,6 +389,8 @@ void xvnc_init_dri3(void)
    if (!priv.gbm)
        FatalError("Failed to create gbm\n");

+    xorg_list_init(&texpixmaps);
+
    if (!dri3_screen_init(screenInfo.screens[0], &xvnc_dri3_info))
        FatalError("Couldn't init dri3\n");
 }
Author	SHA1	Message	Date
Richard Koliser	6c368aa746	Merge branch 'master' into 'release/1.3.2' point noVNC to tip of 1.2.2 release See merge request kasm-technologies/internal/KasmVNC!143	2024-08-28 12:46:37 +00:00
Matt McClaskey	e5404b10e1	point noVNC to tip of 1.2.2 release	2024-08-28 04:22:07 -05:00
Matthew McClaskey	0e043bc4a0	Merge branch 'master' into 'release/1.3.2' Master See merge request kasm-technologies/internal/KasmVNC!142	2024-08-27 09:51:45 +00:00
Matthew McClaskey	515a62e0b9	Merge branch 'feature/KASM-6279_downloads_mimetype' into 'master' Set the mimetype of everything under Downloads/ to binary Closes KASM-6279 See merge request kasm-technologies/internal/KasmVNC!141	2024-07-30 16:59:24 +00:00
Matthew McClaskey	e4db0eb9a7	Merge branch 'bugfix/xproxy-memleak' into 'master' kasmxproxy: Fix cursor mem leak See merge request kasm-technologies/internal/KasmVNC!140	2024-07-30 12:04:34 +00:00
Lauri Kasanen	a6bc1e4b76	Set the mimetype of everything under Downloads/ to binary	2024-07-30 13:51:10 +03:00
Lauri Kasanen	cc1bb0c79f	kasmxproxy: Fix cursor mem leak	2024-07-17 17:56:44 +03:00
Matt McClaskey	bc580857c6	update novnc ref	2024-07-15 12:56:30 -04:00
Matthew McClaskey	e535430a2c	Merge branch 'bugfix/rpi32bit' into 'master' 32-bit changes for rpi, from lgultgithub See merge request kasm-technologies/internal/KasmVNC!139	2024-07-03 16:14:32 +00:00
Lauri Kasanen	6a2c2c82a1	32-bit changes for rpi, from lgultgithub	2024-07-01 14:35:17 +03:00
Matthew McClaskey	3c7555d2f9	Merge branch 'bugfix/KASM-6122_fix_oracle_9' into 'master' KASM-6122 fix oracle build Closes KASM-6122 See merge request kasm-technologies/internal/KasmVNC!138	2024-06-20 11:41:03 +00:00
matt	75b3cb8065	KASM-6122 fix oracle build	2024-06-19 05:49:59 -04:00
Matthew McClaskey	4d4516f727	Merge branch 'bugfix/large-headers' into 'master' Bugfix/large headers See merge request kasm-technologies/internal/KasmVNC!137	2024-06-18 19:43:41 +00:00
Matthew McClaskey	202ac98cf4	Merge branch 'bugfix/KASM-6090_directory_traversal' into 'master' Fix dir traversal by percent-encoding dots Closes KASM-6090 See merge request kasm-technologies/internal/KasmVNC!136	2024-06-18 19:38:17 +00:00
Matthew McClaskey	edf4dcac59	Merge branch 'feature/KASM-5754_dri3_linked_lists' into 'master' dri3: Switch texmaps to a linked list, from DRC/TurboVNC Closes KASM-5754 See merge request kasm-technologies/internal/KasmVNC!129	2024-06-17 16:38:46 +00:00
Lauri Kasanen	79ca2ee054	Increase the request buffer to 16k	2024-06-14 12:19:39 +03:00
Lauri Kasanen	ba6226e308	Send a 400 bad request for too large requests	2024-06-14 12:15:16 +03:00
Lauri Kasanen	4b18320984	Fix dir traversal by percent-encoding dots	2024-06-14 11:58:06 +03:00
Matthew McClaskey	9f7a6b58ce	Merge branch 'feature/KASM-6027-alpine-320' into 'master' KASM-6027 build KasmVNC for Alpine 3.20 See merge request kasm-technologies/internal/KasmVNC!135	2024-05-29 13:53:36 +00:00
ryan.kuba	d67e5288e3	KASM-6027 build KasmVNC for Alpine 3.20	2024-05-28 10:22:18 -04:00
Richard Koliser	5199a98ac4	Merge branch 'feature/KASM-5617_merge_github_pull_requests_201' into 'master' Resolve KASM-5617 "Feature/ merge github pull requests 201" Closes KASM-5617 See merge request kasm-technologies/internal/KasmVNC!126	2024-05-28 13:03:00 +00:00
Richard Koliser	0963a1e10f	KASM-5617 Correct capitalization.	2024-05-28 09:02:01 -04:00
Richard Koliser	9fe714d910	Merge branch 'feature/KASM-5617_merge_github_pull_requests_89' into 'master' Resolve KASM-5617 "Feature/ merge github pull requests 89" Closes KASM-5617 See merge request kasm-technologies/internal/KasmVNC!125	2024-05-28 12:54:38 +00:00
Richard Koliser	eba4c7dae4	Merge branch 'feature/KASM-5617_merge_github_pull_requests' into 'master' Update debian user setup command Closes KASM-5617 See merge request kasm-technologies/internal/KasmVNC!124	2024-05-28 12:53:52 +00:00
Matt McClaskey	7927b7e57b	update novnc ref	2024-05-28 05:31:53 -04:00
Richard Koliser	ce645b39dc	Merge branch 'bugfix/KASM-5989_multi_monitor_invalid_syntax' into 'master' KASM-5989 update to latest novnc commit Closes KASM-5989 See merge request kasm-technologies/internal/KasmVNC!134	2024-05-24 13:09:48 +00:00
matt	16e365747a	KASM-5989 update to latest novnc commit	2024-05-24 06:02:04 -04:00
Matthew McClaskey	511e2ae542	Merge branch 'feature/KASM-5907-fedora-40' into 'master' Resolve KASM-5907 "Feature/ fedora 40" Closes KASM-5907 See merge request kasm-technologies/internal/KasmVNC!133	2024-04-25 15:03:54 +00:00
Ryan Kuba	67eab1b6d4	Resolve KASM-5907 "Feature/ fedora 40"	2024-04-25 15:03:54 +00:00
Matthew McClaskey	574954611c	Merge branch 'feature/KASM-5854-ubuntu-noble' into 'master' Resolve KASM-5854 "Feature/ ubuntu noble" Closes KASM-5854 See merge request kasm-technologies/internal/KasmVNC!132	2024-04-15 18:16:38 +00:00
Ryan Kuba	6eeb2445e8	Resolve KASM-5854 "Feature/ ubuntu noble"	2024-04-15 18:16:38 +00:00
Richard Koliser	b8763c5afd	Merge branch 'bugfix/KASM-5761_fix_failed_pipeline' into 'master' Resolve KASM-5761 "Bugfix/ fix failed pipeline" Closes KASM-5761 See merge request kasm-technologies/internal/KasmVNC!131	2024-03-21 19:34:58 +00:00
Matthew McClaskey	d74f7102f9	changed logic	2024-03-15 11:14:37 +00:00
Matthew McClaskey	3f28ee9d3d	KASM-5761 fix failing pipeline on MRs	2024-03-15 11:13:31 +00:00
Lauri Kasanen	766a55d08f	dri3: Switch texmaps to a linked list, from DRC/TurboVNC	2024-03-14 13:16:06 +02:00
Matthew McClaskey	bb2d903113	Merge branch 'bugfix/KASM-5699_clipboard_exception' into 'master' KASM-5699 Firefox Nightly throwing clipboard related exception on startup Closes KASM-5699 See merge request kasm-technologies/internal/KasmVNC!127	2024-03-12 15:06:23 +00:00
Matt McClaskey	27b3a28a56	updated to latest commit	2024-03-12 08:34:20 -04:00
Mariusz Marciniak	aa6ae266b9	KASM-5699 noVNC commit	2024-03-10 19:57:09 +01:00
Matt McClaskey	3ffb8f93f0	update novnc ref	2024-02-12 19:29:10 -05:00
Matt McClaskey	fe2d67e462	update novnc ref	2024-02-12 08:18:46 -05:00
Matt McClaskey	2dd5a54524	fix merge conflicts	2024-02-12 08:15:40 -05:00
Matt McClaskey	4ec39572fc	Merge remote-tracking branch 'mirror/pr/201' into feature/KASM-5617_merge_github_pull_requests_201	2024-02-12 07:57:16 -05:00
hunicus	d74f7c6ce7	Update debian user setup command	2024-02-01 13:24:37 -05:00
Justin Travis	a10358b5ca	Merge branch 'bugfix/KASM-5524_watermark_rotation_negative_number' into 'master' KASM-5524 negative numbers on text rotation watermark Closes KASM-5524 See merge request kasm-technologies/internal/KasmVNC!123	2024-01-30 18:26:11 +00:00
Matthew McClaskey	124d36a981	Merge branch 'feature/KASM-5523_always_return_desktopSize' into 'master' Send back an ExtendedDesktopSize to a SetDesktopSize request even when resize is not allowed Closes KASM-5523 See merge request kasm-technologies/internal/KasmVNC!122	2024-01-30 17:00:11 +00:00
Matt McClaskey	f02fbb0e2d	update novnc ref to master	2024-01-30 11:59:12 -05:00
Matthew McClaskey	8c7dd2ed30	KASM-5524 negative numbers on text rotation watermark	2024-01-30 16:44:31 +00:00
Matt McClaskey	ae70375afe	KASM-5523 update novnc ref	2024-01-29 10:38:31 -05:00
Lauri Kasanen	127ab45329	Send back an ExtendedDesktopSize to a SetDesktopSize request even when resize is not allowed	2024-01-29 12:20:57 +02:00
Matt McClaskey	3bc1024e7f	update novnc ref	2024-01-26 15:32:59 -05:00
Matt McClaskey	228eb87db1	update novnc ref	2024-01-26 11:15:38 -05:00
Matthew McClaskey	4f726e3654	Merge branch 'feature/KASM-5466_watermark_rotation' into 'master' Implement rotated watermark text support Closes KASM-5466 See merge request kasm-technologies/internal/KasmVNC!121	2024-01-22 14:45:01 +00:00
Matt McClaskey	ed9fbcbec2	[skip CI] correct example config	2024-01-22 08:58:45 -05:00
Matt McClaskey	659a4198fc	KASM-5466 add text rotation yaml config	2024-01-22 07:30:46 -05:00
Lauri Kasanen	5456ccc072	Implement rotated watermark text support	2024-01-22 13:32:32 +02:00
Matthew McClaskey	fddaab5124	Merge branch 'bugfix/KASM-5417_watermark_zlib_incomplete' into 'master' Watermark refactoring, don't handle changes, only send when necessary Closes KASM-5417 See merge request kasm-technologies/internal/KasmVNC!120	2024-01-17 15:55:17 +00:00
Matt McClaskey	7be7e34b51	[skip CI] update noVNC ref to master	2024-01-17 10:53:02 -05:00
Matt McClaskey	5b64eb32f8	pointed novnc ref to branch	2024-01-16 08:58:00 -05:00
Lauri Kasanen	eef8e7264f	Watermark refactoring, don't handle changes, only send when necessary	2024-01-12 10:46:13 +02:00
Matt McClaskey	e8b54db6bf	update novnc ref	2024-01-05 14:02:13 -05:00
Matt McClaskey	7b442658e1	update novnc ref	2024-01-04 09:15:36 -05:00
Matthew McClaskey	408fcd3415	Merge branch 'feature/KASM-5403-fedora-39' into 'master' Resolve KASM-5403 "Feature/ fedora 39" Closes KASM-5403 See merge request kasm-technologies/internal/KasmVNC!119	2024-01-03 17:02:12 +00:00
Ryan Kuba	7cdb7e1f3e	Resolve KASM-5403 "Feature/ fedora 39"	2024-01-03 17:02:12 +00:00
Matthew McClaskey	b595c0bce8	Merge branch 'feature/KASM-5399-alpine-319' into 'master' Resolve KASM-5399 "Feature/ alpine 319" Closes KASM-5399 See merge request kasm-technologies/internal/KasmVNC!118	2024-01-03 12:01:48 +00:00
Ryan Kuba	4c9b065c31	Resolve KASM-5399 "Feature/ alpine 319"	2024-01-03 12:01:48 +00:00
Matt McClaskey	8b5ee59ae2	update novnc ref	2023-12-22 13:45:57 -05:00
Richard Koliser	4114d73ed6	Merge branch 'feature/KASM-5078_multi_monitor' into 'master' Resolve KASM-5078 "Feature/ multi monitor" Closes KASM-5078 See merge request kasm-technologies/internal/KasmVNC!117	2023-12-19 19:44:49 +00:00
Richard Koliser	1d8a2ed59a	KASM-5078 Update NoVNC commit	2023-12-19 13:17:15 -05:00
Richard Koliser	c055920348	KASM-5078 Update noVNC branch	2023-12-19 00:09:50 -05:00
Matthew McClaskey	b2d965b58d	Merge branch 'feature/KASM-5213_email_username' into 'master' Allow emails as usernames Closes KASM-5213 See merge request kasm-technologies/internal/KasmVNC!115	2023-11-30 12:59:21 +00:00
Ben Hildred	07f015e68e	Update README.md to fix duplicate/missing link	2023-11-19 20:31:51 -07:00
Matthew McClaskey	446497ad06	Merge branch 'feature/KASM-5214_log_render_settings_applied' into 'master' Log client settings Closes KASM-5214 See merge request kasm-technologies/internal/KasmVNC!116	2023-11-14 16:14:52 +00:00
Matthew McClaskey	0de752f65e	Merge branch 'feature/KASM-3380_udp_frame_id' into 'master' Resolve KASM-3380 "Feature/ udp frame" Closes KASM-3380 See merge request kasm-technologies/internal/KasmVNC!114	2023-11-14 15:43:09 +00:00
Matt McClaskey	f712f5e7f8	update novnc ref	2023-11-14 10:19:40 -05:00
Matt McClaskey	d090e1b707	update novNC ref	2023-11-14 08:44:08 -05:00
Lauri Kasanen	fb7570709a	Extend username limit to 128-1	2023-11-06 15:22:23 +02:00
Lauri Kasanen	73c3bda8cd	Fix off-by-one in username length check	2023-11-06 13:59:37 +02:00
Lauri Kasanen	9a73cb4a60	Log client settings	2023-11-06 11:44:42 +02:00
Lauri Kasanen	6cd50869c2	Allow emails as usernames	2023-11-06 11:07:01 +02:00
Lauri Kasanen	5823b550a4	Count data rects separately for UDP flip	2023-11-01 10:26:50 +02:00
Lauri Kasanen	29c48a8679	Move frame id updating to a better location	2023-11-01 10:26:50 +02:00
Lauri Kasanen	c88b683354	Write rect count in udp lastrect's X	2023-11-01 10:26:50 +02:00
Lauri Kasanen	7399e5dc62	Add frame number to udp packets	2023-11-01 10:26:33 +02:00
Matt McClaskey	e4a5004f4b	update novnc ref	2023-10-31 07:17:33 -04:00
Matt McClaskey	da7c481fc8	update novnc ref	2023-10-30 15:34:43 -04:00
Matt McClaskey	32f4398115	update novnc ref	2023-10-27 04:46:58 -04:00
Matthew McClaskey	7350b12b3d	Merge branch 'bugfix/KASM-5006-improve-xstartup-debug-output' into 'master' vncserver: more debug output for xstartup Closes KASM-5006 See merge request kasm-technologies/internal/KasmVNC!113	2023-10-20 11:35:19 +00:00
mattmcclaskey	1b25ad8e54	update novnc ref	2023-10-16 09:26:31 -04:00
mattmcclaskey	2165c3e1ba	KASM-5078 multi-monitor	2023-10-16 07:17:31 -04:00
Matthew McClaskey	d390d187b4	Merge branch 'feature/KASM-5027-document-bypassing-select-de-prompt' into 'master' vncserver: document bypassing DE selection prompt Closes KASM-5027 See merge request kasm-technologies/internal/KasmVNC!112	2023-09-17 09:41:48 +00:00
Dmitry Maksyoma	a4034865e6	vncserver: document bypassing DE selection prompt	2023-09-14 16:41:37 +12:00
Dmitry Maksyoma	7d6244fe1c	vncserver: more debug output for xstartup - Use "set -x" in generated xstartup. - Announce running xstartup in logs.	2023-09-03 21:35:13 +12:00
h0x0er	0b5513873c	fixed a typo	2022-02-09 22:03:34 +05:30