Merge branch 'develop' into feature/KASM-1838_libjpeg-turbo-latest

dockerfile-kasm-core

@@ -98,6 +98,10 @@ RUN bash $INST_SCRIPTS/audio/install_audio.sh  && rm -rf $INST_SCRIPTS/audio/
 COPY ./src/ubuntu/install/audio_input $INST_SCRIPTS/audio_input/
 RUN bash $INST_SCRIPTS/audio_input/install_audio_input.sh && rm -rf $INST_SCRIPTS/audio_input/
 
+### Install custom cursors
+COPY ./src/ubuntu/install/cursors $INST_SCRIPTS/cursors/
+RUN bash $INST_SCRIPTS/cursors/install_cursors.sh && rm -rf $INST_SCRIPTS/cursors/
+
 ### Copy built Squid
 COPY --from=squid_builder /usr/local/squid /usr/local/squid
 

dockerfile-kasm-core-centos

@@ -91,6 +91,9 @@ RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm
 COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/
 RUN bash $INST_SCRIPTS/kasm_upload_server/install_kasm_upload_server.sh  && rm -rf $INST_SCRIPTS/kasm_upload_server/
 
+### Install custom cursors
+COPY ./src/ubuntu/install/cursors $INST_SCRIPTS/cursors/
+RUN bash $INST_SCRIPTS/cursors/install_cursors.sh && rm -rf $INST_SCRIPTS/cursors/
 
 ### Install Audio
 COPY ./src/ubuntu/install/audio $INST_SCRIPTS/audio/

src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="ThemeName" type="empty"/>
+    <property name="IconThemeName" type="empty"/>
+    <property name="DoubleClickTime" type="empty"/>
+    <property name="DoubleClickDistance" type="empty"/>
+    <property name="DndDragThreshold" type="empty"/>
+    <property name="CursorBlink" type="empty"/>
+    <property name="CursorBlinkTime" type="empty"/>
+    <property name="SoundThemeName" type="empty"/>
+    <property name="EnableEventSounds" type="empty"/>
+    <property name="EnableInputFeedbackSounds" type="empty"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="DPI" type="empty"/>
+    <property name="Antialias" type="empty"/>
+    <property name="Hinting" type="empty"/>
+    <property name="HintStyle" type="empty"/>
+    <property name="RGBA" type="empty"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="empty"/>
+    <property name="ColorPalette" type="empty"/>
+    <property name="FontName" type="empty"/>
+    <property name="IconSizes" type="empty"/>
+    <property name="KeyThemeName" type="empty"/>
+    <property name="ToolbarStyle" type="empty"/>
+    <property name="ToolbarIconSize" type="empty"/>
+    <property name="MenuImages" type="empty"/>
+    <property name="ButtonImages" type="empty"/>
+    <property name="MenuBarAccel" type="empty"/>
+    <property name="CursorThemeName" type="string" value="bridge"/>
+    <property name="CursorThemeSize" type="empty"/>
+    <property name="DecorationLayout" type="empty"/>
+  </property>
+</channel>

src/common/startup_scripts/vnc_startup.sh

@@ -57,7 +57,7 @@ function start_kasmvnc (){
 
     rm -rf $HOME/.vnc/*.pid
 
-	vncserver $DISPLAY -depth 24 -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -cert ${HOME}/.vnc/self.pem -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 $VNCOPTIONS
+	vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -cert ${HOME}/.vnc/self.pem -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 $VNCOPTIONS
 
 	KASM_PROCS['kasmvnc']=$(cat $HOME/.vnc/*${DISPLAY_NUM}.pid)
 

src/common/xfce/window_manager_startup.sh

@@ -3,11 +3,6 @@ set -e
 
 echo -e "\n------------------ Xfce4 window manager startup------------------"
 
-### disable screen saver and power management
-xset -dpms &
-xset s noblank &
-xset s off &
-
 if [ "${START_XFCE4}" == "1" ] ;
     then
         echo "Starting XFCE"

src/ubuntu/install/cursors/install_cursors.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+
+echo "Installing Cursors"
+cd $INST_SCRIPTS/cursors
+
+tar -xzf cursor-aero.tar.gz -C /usr/share/icons/
+tar -xzf cursor-bridge.tar.gz -C /usr/share/icons/
+tar -xzf cursor-capitaine-r4.tar.gz -C /usr/share/icons/

src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh

@@ -6,11 +6,11 @@ cd /tmp
 
 if [ "${DISTRO}" == "kali" ]  ;
 then
-    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/811e7cde3aed4064a4f8d2c9eb161183c873ffde/kasmvncserver_kali-rolling_0.9.3_master_811e7c_amd64.deb"
+    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/6f2805e18652781213be6a385f7a05f3d22b218b/kasmvncserver_kali-rolling_0.9.3_master_6f2805_amd64.deb"
 elif [ "${DISTRO}" == "centos" ] ; then
-    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/811e7cde3aed4064a4f8d2c9eb161183c873ffde/kasmvncserver_centos_core_0.9.3_master_811e7c_x86_64.rpm"
+    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/6f2805e18652781213be6a385f7a05f3d22b218b/kasmvncserver_centos_core_0.9.3_master_6f2805_x86_64.rpm"
 else
-    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/811e7cde3aed4064a4f8d2c9eb161183c873ffde/kasmvncserver_bionic_0.9.3_master_811e7c_amd64.deb"
+    BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/6f2805e18652781213be6a385f7a05f3d22b218b/kasmvncserver_bionic_0.9.3_master_6f2805_amd64.deb"
 fi
 
 

src/ubuntu/install/xfce/install_xfce_ui.sh

@@ -14,6 +14,32 @@ get_rid_of_xfce_battery_widget() {
   yum remove -y xfce4-power-manager
 }
 
+config_xinit_disable_screensaver() {
+  mkdir -p /etc/X11/xinit/xinitrc.d/
+  cat >/etc/X11/xinit/xinitrc.d/disable_screensaver.sh <<EOL
+#!/bin/sh
+set -x
+xset -dpms
+xset s off
+xset q
+EOL
+
+chmod +x /etc/X11/xinit/xinitrc.d/disable_screensaver.sh
+}
+
+replace_default_xinit() {
+
+  cat >/etc/X11/xinit/xinitrc <<EOL
+#!/bin/sh
+for file in /etc/X11/xinit/xinitrc.d/* ; do
+        . \$file
+done
+. /etc/X11/Xsession
+EOL
+
+chmod +x /etc/X11/xinit/xinitrc
+}
+
 echo "Install Xfce4 UI components"
 if [ "$DISTRO" != "centos" ]; then
   apt-get update
@@ -43,6 +69,14 @@ else
   apt-get clean -y
 fi
 
+
+if [ "$DISTRO" = "centos" ]; then
+  config_xinit_disable_screensaver
+else
+  replace_default_xinit
+  config_xinit_disable_screensaver
+fi
+
 # Override default login script so users cant log themselves out of the desktop dession
 cat >/usr/bin/xfce4-session-logout <<EOL
 #!/usr/bin/env bash

src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml

@@ -30,7 +30,7 @@
         <property name="MenuImages" type="empty"/>
         <property name="ButtonImages" type="empty"/>
         <property name="MenuBarAccel" type="empty"/>
-        <property name="CursorThemeName" type="empty"/>
+        <property name="CursorThemeName" type="string" value="bridge"/>
         <property name="CursorThemeSize" type="empty"/>
         <property name="DecorationLayout" type="empty"/>
     </property>