From 2b0d8d5bb27e719a13162495ff210505d5f6a61c Mon Sep 17 00:00:00 2001
From: Justin Travis <justin@kasmweb.com>
Date: Fri, 13 May 2022 20:27:54 +0000
Subject: [PATCH] Resolve KASM-2436 "Feature/ gpu support"

---
 src/ubuntu/install/chrome/install_chrome.sh               | 8 +++++++-
 src/ubuntu/install/chromium/install_chromium.sh           | 8 +++++++-
 src/ubuntu/install/dind/install_dind.sh                   | 1 -
 src/ubuntu/install/dind_rootless/install_dind_rootless.sh | 2 --
 src/ubuntu/install/tracelabs/install_tracelabs.sh         | 1 -
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/ubuntu/install/chrome/install_chrome.sh b/src/ubuntu/install/chrome/install_chrome.sh
index d9fa9c1..17f26b3 100644
--- a/src/ubuntu/install/chrome/install_chrome.sh
+++ b/src/ubuntu/install/chrome/install_chrome.sh
@@ -53,7 +53,13 @@ cat >/usr/bin/google-chrome <<EOL
 #!/usr/bin/env bash
 sed -i 's/"exited_cleanly":false/"exited_cleanly":true/' ~/.config/google-chrome/Default/Preferences
 sed -i 's/"exit_type":"Crashed"/"exit_type":"None"/' ~/.config/google-chrome/Default/Preferences
-/opt/google/chrome/google-chrome ${CHROME_ARGS} "\$@"
+if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "\${KASM_EGL_CARD}" ] && [ ! -z "\${KASM_RENDERD}" ] && [ -O "\${KASM_RENDERD}" ] && [ -O "\${KASM_EGL_CARD}" ] ; then
+    echo "Starting Chrome with GPU Acceleration on EGL device \${KASM_EGL_CARD}"
+    vglrun -d "\${KASM_EGL_CARD}" /opt/google/chrome/google-chrome ${CHROME_ARGS} "\$@" 
+else
+    echo "Starting Chrome"
+    /opt/google/chrome/google-chrome ${CHROME_ARGS} "\$@"
+fi
 EOL
 chmod +x /usr/bin/google-chrome
 cp /usr/bin/google-chrome /usr/bin/chrome
diff --git a/src/ubuntu/install/chromium/install_chromium.sh b/src/ubuntu/install/chromium/install_chromium.sh
index cb9f8ad..8268333 100644
--- a/src/ubuntu/install/chromium/install_chromium.sh
+++ b/src/ubuntu/install/chromium/install_chromium.sh
@@ -71,7 +71,13 @@ cat >/usr/bin/chromium-browser <<EOL
 #!/usr/bin/env bash
 sed -i 's/"exited_cleanly":false/"exited_cleanly":true/' ~/.config/chromium/Default/Preferences
 sed -i 's/"exit_type":"Crashed"/"exit_type":"None"/' ~/.config/chromium/Default/Preferences
-/usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
+if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "\${KASM_EGL_CARD}" ] && [ ! -z "\${KASM_RENDERD}" ] && [ -O "\${KASM_RENDERD}" ] && [ -O "\${KASM_EGL_CARD}" ] ; then
+    echo "Starting Chrome with GPU Acceleration on EGL device \${KASM_EGL_CARD}"
+    vglrun -d "\${KASM_EGL_CARD}" /usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@" 
+else
+    echo "Starting Chrome"
+    /usr/bin/chromium-browser-orig ${CHROME_ARGS} "\$@"
+fi
 EOL
 chmod +x /usr/bin/chromium-browser
 cp /usr/bin/chromium-browser /usr/bin/chromium
diff --git a/src/ubuntu/install/dind/install_dind.sh b/src/ubuntu/install/dind/install_dind.sh
index e7ee594..79116f5 100644
--- a/src/ubuntu/install/dind/install_dind.sh
+++ b/src/ubuntu/install/dind/install_dind.sh
@@ -47,7 +47,6 @@ mkdir -p /usr/local/lib/docker/cli-plugins
 curl -L https://github.com/docker/compose/releases/download/v2.0.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/lib/docker/cli-plugins/docker-compose
 chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
 
-useradd -m -d /home/kasm-user -s /bin/bash kasm-user 
 echo 'kasm-user:kasm-user' | chpasswd
 echo 'kasm-user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 
diff --git a/src/ubuntu/install/dind_rootless/install_dind_rootless.sh b/src/ubuntu/install/dind_rootless/install_dind_rootless.sh
index 1e7b07c..def4378 100644
--- a/src/ubuntu/install/dind_rootless/install_dind_rootless.sh
+++ b/src/ubuntu/install/dind_rootless/install_dind_rootless.sh
@@ -44,5 +44,3 @@ echo "Installing Docker Compose"
 mkdir -p /usr/local/lib/docker/cli-plugins
 curl -L https://github.com/docker/compose/releases/download/v2.0.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/lib/docker/cli-plugins/docker-compose
 chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
-
-useradd -m -d /home/kasm-user -s /bin/bash kasm-user 
diff --git a/src/ubuntu/install/tracelabs/install_tracelabs.sh b/src/ubuntu/install/tracelabs/install_tracelabs.sh
index 51741f0..4481ae7 100644
--- a/src/ubuntu/install/tracelabs/install_tracelabs.sh
+++ b/src/ubuntu/install/tracelabs/install_tracelabs.sh
@@ -19,7 +19,6 @@ cat kali-config/variant-tracelabs/package-lists/kali.list.chroot | sed '/^#/d' |
 
 sh kali-config/common/hooks/normal/osint-packages.chroot
 
-useradd kasm-user 
 chown -R 1000:1000 \
     /usr/share/phoneinfoga \
     /usr/share/Spiderpig \