From ce4bc5ca8799cd438e91b9af835cfc4396abed0e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 9 Feb 2021 19:25:23 +0100
Subject: [kiosk-common/kiosk-chromium] Add system certs to cert store

References #3418
---
 .../data/opt/openslx/scripts/kiosk-launch.d/00-chromium             | 6 ++++++
 core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch     | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'core/modules')

diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
index cf9246a8..a98332df 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
+++ b/core/modules/kiosk-chromium/data/opt/openslx/scripts/kiosk-launch.d/00-chromium
@@ -9,6 +9,9 @@ if [ "$(whoami)" = "demo" ]; then
 	mkdir -p "$HOME/.config/chromium/Default"
 fi
 
+cert_to_nssdb /etc/ssl/certs/ "${HOME}/.pki/nssdb" &
+nss_pid=$!
+
 # Helper to decode URL-encoded strings
 # e.g. urldecode http%3A%2F%2Ffoobar.com -> http://foobar.com
 urldecode() {
@@ -136,5 +139,8 @@ if [ -n "$SLX_BROWSER_INSECURE" ]; then
 	chromium_args+=("--allow-running-insecure-content" "--ignore-certificate-errors")
 fi
 
+# Wait until cert store is fully populated
+wait $nss_pid
+
 # finally exec to chromium
 exec chromium-browser "${chromium_args[@]}"
diff --git a/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch b/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch
index 79f08e3d..8525d2f2 100755
--- a/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch
+++ b/core/modules/kiosk-common/data/opt/openslx/scripts/kiosk-launch
@@ -7,6 +7,8 @@ export PATH="$PATH:/opt/openslx/sbin:/opt/openslx/bin"
 
 [ -z "$SLX_BROWSER_URL" ] && exit 1
 
+. /opt/openslx/bin/slx-tools
+
 # disable power management features
 xset s off
 xset -dpms
-- 
cgit v1.2.3-55-g7522