From 9ec4cba1847b50bba094e24533cef96925ef5d8b Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Tue, 17 Aug 2021 00:00:55 +1200 Subject: [PATCH 1/3] Slash a minute off tarball build --- builder/dockerfile.centos_core.build | 3 +-- builder/dockerfile.debian_bullseye.build | 3 +-- builder/dockerfile.debian_buster.build | 3 +-- builder/dockerfile.fedora_thirtythree.build | 3 +-- builder/dockerfile.kali_kali-rolling.build | 3 +-- builder/dockerfile.ubuntu1604.build | 3 +-- builder/dockerfile.ubuntu_bionic.build | 3 +-- builder/dockerfile.ubuntu_focal.build | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/builder/dockerfile.centos_core.build b/builder/dockerfile.centos_core.build index 06dad21..4574075 100644 --- a/builder/dockerfile.centos_core.build +++ b/builder/dockerfile.centos_core.build @@ -22,8 +22,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.debian_bullseye.build b/builder/dockerfile.debian_bullseye.build index 3c19f4c..0a8428e 100644 --- a/builder/dockerfile.debian_bullseye.build +++ b/builder/dockerfile.debian_bullseye.build @@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.debian_buster.build b/builder/dockerfile.debian_buster.build index 721b1a6..a47b6fe 100644 --- a/builder/dockerfile.debian_buster.build +++ b/builder/dockerfile.debian_buster.build @@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.fedora_thirtythree.build b/builder/dockerfile.fedora_thirtythree.build index be70715..8dc4b29 100644 --- a/builder/dockerfile.fedora_thirtythree.build +++ b/builder/dockerfile.fedora_thirtythree.build @@ -31,8 +31,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.kali_kali-rolling.build b/builder/dockerfile.kali_kali-rolling.build index 6087895..9705e42 100644 --- a/builder/dockerfile.kali_kali-rolling.build +++ b/builder/dockerfile.kali_kali-rolling.build @@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.ubuntu1604.build b/builder/dockerfile.ubuntu1604.build index a938ff8..8ca3260 100644 --- a/builder/dockerfile.ubuntu1604.build +++ b/builder/dockerfile.ubuntu1604.build @@ -14,8 +14,7 @@ RUN cd /tmp/libwebp-1.0.2 && ./configure && make && make install RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker diff --git a/builder/dockerfile.ubuntu_bionic.build b/builder/dockerfile.ubuntu_bionic.build index cee01e1..d95bd02 100644 --- a/builder/dockerfile.ubuntu_bionic.build +++ b/builder/dockerfile.ubuntu_bionic.build @@ -28,8 +28,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.ubuntu_focal.build b/builder/dockerfile.ubuntu_focal.build index 9c52a77..d0562d1 100644 --- a/builder/dockerfile.ubuntu_focal.build +++ b/builder/dockerfile.ubuntu_focal.build @@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \ RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo -COPY . /src -RUN chown -R docker:docker /src +COPY --chown=docker:docker . /src/ USER docker ENTRYPOINT ["/src/builder/build.sh"] From 4b28667e90cff336ea39c085f74075ff21c25eff Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Tue, 17 Aug 2021 13:13:51 +0300 Subject: [PATCH 2/3] Fix possible missing clipboard deinit --- common/rfb/VNCServerST.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx index fd13cf3..a564021 100644 --- a/common/rfb/VNCServerST.cxx +++ b/common/rfb/VNCServerST.cxx @@ -273,6 +273,11 @@ void VNCServerST::removeSocket(network::Socket* sock) { std::list::iterator ci; for (ci = clients.begin(); ci != clients.end(); ci++) { if ((*ci)->getSock() == sock) { + + if (clipboardClient == *ci) + handleClipboardAnnounce(*ci, false); + clipboardRequestors.remove(*ci); + // - Delete the per-Socket resources delete *ci; From d80eb39686ee394b6061072e62aed1f8c1e73727 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Tue, 17 Aug 2021 13:30:33 +0300 Subject: [PATCH 3/3] Fix DigitalOcean load balancer websocket connection (they too used wrong case in a header) --- common/network/websocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/network/websocket.c b/common/network/websocket.c index 3d3111d..47ac11d 100644 --- a/common/network/websocket.c +++ b/common/network/websocket.c @@ -583,7 +583,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) { headers->host[end-start] = '\0'; headers->origin[0] = '\0'; - start = strstr(handshake, "\r\nOrigin: "); + start = strcasestr(handshake, "\r\nOrigin: "); if (start) { start += 10; } else {