From cb72e7c94ccb09394aa9525c07d397e54f0c34d1 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Thu, 18 May 2023 23:27:22 +0200
Subject: [PATCH] Fix key-chain

---
 Dockerfile                                       |  2 +-
 .../dependencies.d/init-keyring}                 |  0
 .../dependencies.d/init-config}                  |  0
 root/etc/s6-overlay/s6-rc.d/init-keyring/run     | 16 ++++++++++++++++
 root/etc/s6-overlay/s6-rc.d/init-keyring/type    |  1 +
 root/etc/s6-overlay/s6-rc.d/init-keyring/up      |  1 +
 .../s6-overlay/s6-rc.d/init-vscode-server/run    | 11 -----------
 root/etc/s6-overlay/s6-rc.d/svc-dbus/run         |  5 -----
 root/etc/s6-overlay/s6-rc.d/svc-dbus/type        |  1 -
 .../s6-rc.d/user/contents.d/init-keyring         |  0
 10 files changed, 19 insertions(+), 18 deletions(-)
 rename root/etc/s6-overlay/s6-rc.d/{svc-dbus/dependencies.d/init-services => init-config-end/dependencies.d/init-keyring} (100%)
 rename root/etc/s6-overlay/s6-rc.d/{user/contents.d/svc-dbus => init-keyring/dependencies.d/init-config} (100%)
 create mode 100755 root/etc/s6-overlay/s6-rc.d/init-keyring/run
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-keyring/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-keyring/up
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-dbus/run
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-dbus/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-keyring

diff --git a/Dockerfile b/Dockerfile
index b3df287..b614d95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,13 +19,13 @@ RUN \
   echo "**** install runtime dependencies ****" && \
   apt-get update && \
   apt-get install -y \
-    dbus-x11 \
     git \
     nano \
     net-tools \
     netcat \
     sudo && \
   apt-get install -y --no-install-recommends \
+    dbus-x11 \
     gnome-keyring \
     libatomic1 \
     libsecret-1-dev && \
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-dbus/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-keyring
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/svc-dbus/dependencies.d/init-services
rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-keyring
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-dbus b/root/etc/s6-overlay/s6-rc.d/init-keyring/dependencies.d/init-config
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-dbus
rename to root/etc/s6-overlay/s6-rc.d/init-keyring/dependencies.d/init-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-keyring/run b/root/etc/s6-overlay/s6-rc.d/init-keyring/run
new file mode 100755
index 0000000..c212dc8
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-keyring/run
@@ -0,0 +1,16 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+mkdir -p /config/.local/share/keyrings
+
+if [ -f /etc/machine-id ]; then
+    dbus-uuidgen --ensure
+    sleep 1
+fi
+
+echo "keyring"
+eval $(s6-setuidgid abc dbus-launch --sh-syntax)
+echo 'somecredstorepass' | eval $(s6-setuidgid abc gnome-keyring-daemon --daemonize --components=pkcs11,secrets,ssh --unlock)
+echo -n "${DBUS_SESSION_BUS_ADDRESS}" >/run/s6/container_environment/DBUS_SESSION_BUS_ADDRESS
+#echo -n "${GNOME_KEYRING_CONTROL}" >/run/s6/container_environment/GNOME_KEYRING_CONTROL
+#echo -n "${SSH_AUTH_SOCK}" >/run/s6/container_environment/SSH_AUTH_SOCK
diff --git a/root/etc/s6-overlay/s6-rc.d/init-keyring/type b/root/etc/s6-overlay/s6-rc.d/init-keyring/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-keyring/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-keyring/up b/root/etc/s6-overlay/s6-rc.d/init-keyring/up
new file mode 100644
index 0000000..46ea733
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-keyring/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-keyring/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run b/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run
index 73028d2..d0d0d04 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-vscode-server/run
@@ -30,17 +30,6 @@ for f in code_tunnel.json last-used-servers.json license_consent.json token.json
     fi
 done
 
-if [ -f /etc/machine-id ]; then
-    dbus-uuidgen --ensure
-    sleep 1
-fi
-
-if [ -z "${DBUS_SESSION_BUS_PID}" ]; then
-    eval $(s6-setuidgid abc dbus-launch)
-    echo -n "${DBUS_SESSION_BUS_ADDRESS}" >/run/s6/container_environment/DBUS_SESSION_BUS_ADDRESS
-    echo -n "${DBUS_SESSION_BUS_PID}" >/run/s6/container_environment/DBUS_SESSION_BUS_PID
-fi
-
 
 [[ ! -f /config/.bashrc ]] && \
     cp /root/.bashrc /config/.bashrc
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-dbus/run b/root/etc/s6-overlay/s6-rc.d/svc-dbus/run
deleted file mode 100644
index a1d49c5..0000000
--- a/root/etc/s6-overlay/s6-rc.d/svc-dbus/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-exec \
-    dbus-daemon --system --nofork
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-dbus/type b/root/etc/s6-overlay/s6-rc.d/svc-dbus/type
deleted file mode 100644
index 1780f9f..0000000
--- a/root/etc/s6-overlay/s6-rc.d/svc-dbus/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-keyring b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-keyring
new file mode 100644
index 0000000..e69de29