fix(desktop-lite): initial environment for services

Automattic · Aug 13, 2024 · 7e1ace9 · 7e1ace9
1 parent 4d48356
commit 7e1ace9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/features/src/desktop-lite/devcontainer-feature.json b/features/src/desktop-lite/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "desktop-lite",
     "name": "Desktop Lite",
     "description": "A lightweight desktop environment for development.",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "documentationURL": "https://github.com/Automattic/vip-codespaces/tree/trunk/features/src/desktop-lite",
     "containerEnv": {
         "DISPLAY": "127.0.0.1:0"

diff --git a/features/src/desktop-lite/entrypoint.tpl b/features/src/desktop-lite/entrypoint.tpl
@@ -13,7 +13,6 @@ else
 fi
 
 # shellcheck disable=SC2154,SC2086
-setpriv --reuid="${_REMOTE_USER}" --regid="${_REMOTE_USER}" --inh-caps=-all --init-groups \
-    /usr/bin/Xtigervnc -geometry "${VNC_GEOMETRY}" -listen tcp -ac ${AUTH_OPTS} -AlwaysShared -AcceptKeyEvents -AcceptPointerEvents -SendCutText -AcceptCutText :0 &
-DISPLAY=:0 setpriv --reuid="${_REMOTE_USER}" --regid="${_REMOTE_USER}" --inh-caps=-all --init-groups /usr/bin/openbox &
-setpriv --reuid="${_REMOTE_USER}" --regid="${_REMOTE_USER}" --inh-caps=-all --init-groups /usr/local/bin/easy-novnc -a :5800 -h 127.0.0.1 --no-url-password &
+su -s /bin/sh -c "/usr/bin/Xtigervnc -geometry \"${VNC_GEOMETRY}\" -listen tcp -ac ${AUTH_OPTS} -AlwaysShared -AcceptKeyEvents -AcceptPointerEvents -SendCutText -AcceptCutText :0" "${_REMOTE_USER}" &
+DISPLAY=:0 su -s /bin/sh -c '/usr/bin/openbox' "${_REMOTE_USER}" &
+su -s /bin/sh -c '/usr/local/bin/easy-novnc -a :5800 -h 127.0.0.1 --no-url-password' "${_REMOTE_USER}" &
diff --git a/features/src/desktop-lite/install.sh b/features/src/desktop-lite/install.sh
@@ -49,7 +49,7 @@ if [ "${ENABLED}" = "true" ]; then
                 PACKAGES="${PACKAGES} tigervnc-standalone-server"
             fi
 
-            if ! hash tigervncpasswd >/dev/null 2>&1; then
+            if ! hash tigervncpasswd >/dev/null 2>&1 && [ -n "$(apt-cache --names-only search '^tigervnc-tools$')" ]; then
                 PACKAGES="${PACKAGES} tigervnc-tools"
             fi
 

diff --git a/features/src/desktop-lite/service-run.novnc.tpl b/features/src/desktop-lite/service-run.novnc.tpl
@@ -6,5 +6,10 @@ set -eu
 exec 2>&1
 
 # shellcheck disable=SC2154
-exec chpst -u "${_REMOTE_USER}:${_REMOTE_USER}" \
+export USER="${_REMOTE_USER}"
+export LOGNAME="${USER}"
+# shellcheck disable=SC2155
+export HOME="$(getent passwd "${USER}" | cut -d: -f6)"
+
+exec chpst -u "${USER}:${USER}" \
     /usr/local/bin/easy-novnc -a :5800 -h 127.0.0.1 --no-url-password
diff --git a/features/src/desktop-lite/service-run.openbox.tpl b/features/src/desktop-lite/service-run.openbox.tpl
@@ -9,4 +9,9 @@ sv start tigervnc || true
 
 export DISPLAY=:0
 # shellcheck disable=SC2154
-exec chpst -u "${_REMOTE_USER}:${_REMOTE_USER}" /usr/bin/openbox
+export USER="${_REMOTE_USER}"
+export LOGNAME="${USER}"
+# shellcheck disable=SC2155
+export HOME="$(getent passwd "${USER}" | cut -d: -f6)"
+
+exec chpst -u "${USER}:${USER}" /usr/bin/openbox
diff --git a/features/src/desktop-lite/service-run.tigervnc.tpl b/features/src/desktop-lite/service-run.tigervnc.tpl
@@ -13,6 +13,12 @@ else
     AUTH_OPTS="-SecurityTypes None"
 fi
 
-# shellcheck disable=SC2154,SC2086
-exec chpst -u "${_REMOTE_USER}:${_REMOTE_USER}" \
+# shellcheck disable=SC2154
+export USER="${_REMOTE_USER}"
+export LOGNAME="${USER}"
+# shellcheck disable=SC2155
+export HOME="$(getent passwd "${USER}" | cut -d: -f6)"
+
+# shellcheck disable=SC2086
+exec chpst -u "${USER}:${USER}" \
     /usr/bin/Xtigervnc -geometry "${VNC_GEOMETRY}" -listen tcp -ac ${AUTH_OPTS} -AlwaysShared -AcceptKeyEvents -AcceptPointerEvents -SendCutText -AcceptCutText :0