publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/KASM-1838-libjpeg-turbo-from-source

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-21 00:07:47 +12:00
parent 20a8008edf 6f2805e186
commit 09576ceaf9
14 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

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

3
builder/dockerfile.centos_core.build
View File

@@ -22,8 +22,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd RUN useradd -m docker && echo "docker:docker" | chpasswd
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.debian_bullseye.build
View File

@@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.debian_buster.build
View File

@@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.fedora_thirtythree.build
View File

@@ -31,8 +31,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd RUN useradd -m docker && echo "docker:docker" | chpasswd
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.kali_kali-rolling.build
View File

@@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.ubuntu1604.build
View File

@@ -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 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker

3
builder/dockerfile.ubuntu_bionic.build
View File

@@ -32,8 +32,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.ubuntu_focal.build
View File

@@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

11
common/network/TcpSocket.cxx
View File

@@ -40,6 +40,8 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include <wordexp.h> #include <wordexp.h>
#include <sys/types.h>
#include <unistd.h>
#include "websocket.h" #include "websocket.h"
#include <network/GetAPI.h> #include <network/GetAPI.h>
@@ -564,7 +566,7 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
if (bind(sock, &sa.u.sa, listenaddrlen) == -1) { if (bind(sock, &sa.u.sa, listenaddrlen) == -1) {
int e = errorNumber; int e = errorNumber;
closesocket(sock); closesocket(sock);
throw SocketException("failed to bind socket", e); throw SocketException("failed to bind socket, is someone else on our -websocketPort?", e);
} }
listen(sock); // sets the internal fd listen(sock); // sets the internal fd
@@ -574,13 +576,16 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
// //
internalSocket = socket(AF_UNIX, SOCK_STREAM, 0); internalSocket = socket(AF_UNIX, SOCK_STREAM, 0);
char sockname[32];
sprintf(sockname, ".KasmVNCSock%u", getpid());
struct sockaddr_un addr; struct sockaddr_un addr;
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, ".KasmVNCSock"); strcpy(addr.sun_path, sockname);
addr.sun_path[0] = '\0'; addr.sun_path[0] = '\0';
if (bind(internalSocket, (struct sockaddr *) &addr, if (bind(internalSocket, (struct sockaddr *) &addr,
sizeof(sa_family_t) + sizeof(".KasmVNCSock"))) { sizeof(sa_family_t) + strlen(sockname))) {
throw SocketException("failed to bind socket", errorNumber); throw SocketException("failed to bind socket", errorNumber);
} }

2
common/network/websocket.c
View File

@@ -583,7 +583,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
headers->host[end-start] = '\0'; headers->host[end-start] = '\0';
headers->origin[0] = '\0'; headers->origin[0] = '\0';
start = strstr(handshake, "\r\nOrigin: "); start = strcasestr(handshake, "\r\nOrigin: ");
if (start) { if (start) {
start += 10; start += 10;
} else { } else {

8
common/network/websockify.c
View File

@@ -21,6 +21,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h>
#include "websocket.h" #include "websocket.h"
/* /*
@@ -223,9 +224,12 @@ static void do_proxy(ws_ctx_t *ws_ctx, int target) {
void proxy_handler(ws_ctx_t *ws_ctx) { void proxy_handler(ws_ctx_t *ws_ctx) {
char sockname[32];
sprintf(sockname, ".KasmVNCSock%u", getpid());
struct sockaddr_un addr; struct sockaddr_un addr;
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, ".KasmVNCSock"); strcpy(addr.sun_path, sockname);
addr.sun_path[0] = '\0'; addr.sun_path[0] = '\0';
struct timeval tv; struct timeval tv;
@@ -243,7 +247,7 @@ void proxy_handler(ws_ctx_t *ws_ctx) {
handler_msg("connecting to VNC target\n"); handler_msg("connecting to VNC target\n");
if (connect(tsock, (struct sockaddr *) &addr, if (connect(tsock, (struct sockaddr *) &addr,
sizeof(sa_family_t) + sizeof(".KasmVNCSock")) < 0) { sizeof(sa_family_t) + strlen(sockname)) < 0) {
handler_emsg("Could not connect to target: %s\n", handler_emsg("Could not connect to target: %s\n",
strerror(errno)); strerror(errno));

5
common/rfb/VNCServerST.cxx
View File

@@ -273,6 +273,11 @@ void VNCServerST::removeSocket(network::Socket* sock) {
std::list<VNCSConnectionST*>::iterator ci; std::list<VNCSConnectionST*>::iterator ci;
for (ci = clients.begin(); ci != clients.end(); ci++) { for (ci = clients.begin(); ci != clients.end(); ci++) {
if ((*ci)->getSock() == sock) { if ((*ci)->getSock() == sock) {
if (clipboardClient == *ci)
handleClipboardAnnounce(*ci, false);
clipboardRequestors.remove(*ci);
// - Delete the per-Socket resources // - Delete the per-Socket resources
delete *ci; delete *ci;

2
kasmweb

Submodule kasmweb updated: f9f5b01cc2...ba40cacce0