From 1525f5673e6c6d33cc4e460d1470f93fda63ec5d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 3 Jan 2024 16:05:11 +0100
Subject: [kiosk-chromium/kiosk-slxbrowser] Remove legacy, unused variables

SLX_BROWSER_IS_WHITELIST
SLX_BROWSER_URLLIST
---
 .../opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter   | 9 ---------
 .../data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser        | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter
index f0555260..1287fff0 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter
+++ b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter
@@ -54,15 +54,6 @@ main() {
 	[ -z "$SLX_PXE_CLIENT_IP" ] && . /opt/openslx/config
 
 	local url_policy_file="/etc/chromium-browser/policies/managed/url-filter.json"
-	if [ -z "$SLX_BROWSER_BLACKLIST" ] && [ -z "$SLX_BROWSER_WHITELIST" ]; then
-		# Legacy format
-		if [ "$SLX_BROWSER_IS_WHITELIST" -eq 1 ]; then
-			SLX_BROWSER_BLACKLIST="*"
-			SLX_BROWSER_WHITELIST="$SLX_BROWSER_URLLIST"
-		else
-			SLX_BROWSER_BLACKLIST="$SLX_BROWSER_URLLIST"
-		fi
-	fi
 	if [ -z "$SLX_BROWSER_BLACKLIST" ] && [ -z "$SLX_BROWSER_WHITELIST" ]; then
 		rm -f -- "$url_policy_file"
 		return
diff --git a/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser b/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser
index 4ec49eca..ea9d2e4c 100644
--- a/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser
+++ b/core/modules/kiosk-slxbrowser/data/opt/openslx/scripts/kiosk-launch.d/00-slxbrowser
@@ -9,15 +9,6 @@ OPTS=()
 [ -n "$SLX_BROWSER_INSECURE" ] && [ "$SLX_BROWSER_INSECURE" -gt 0 ] && OPTS+=("--insecure")
 # On inactivity, reload every X seconds
 [ -n "$SLX_BROWSER_RELOAD_SECS" ] && [ "$SLX_BROWSER_RELOAD_SECS" -gt 0 ] && OPTS+=("--reload-interval" "$SLX_BROWSER_RELOAD_SECS")
-# If we have no black- or whitelist, see if the legacy vars exist
-if [ -z "$SLX_BROWSER_BLACKLIST" ] && [ -z "$SLX_BROWSER_WHITELIST" ] && [ -n "$SLX_BROWSER_URLLIST" ]; then
-	# If set, is a space separated list of URLs or hosts
-	if [ "$SLX_BROWSER_IS_WHITELIST" -gt 0 ]; then
-		SLX_BROWSER_WHITELIST="$SLX_BROWSER_URLLIST"
-	else
-		SLX_BROWSER_BLACKLIST="$SLX_BROWSER_URLLIST"
-	fi
-fi
 
 if [ -n "$SLX_BROWSER_BLACKLIST" ]; then
 	# Turn into file with one entry per line
-- 
cgit v1.2.3-55-g7522