From 213f6de2afc40e27bf6b773b72db0d6104ffd7fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Sat, 28 Sep 2024 17:12:55 +0000 Subject: [PATCH] buildworker: start: fix leaking BUILDWORKER_TLS env variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I've noticed leakage of BUILDWORKER_TLS environment variable in build logs, so lets fix it in a generic way via new `cleanup_buildworker_env_variables()` by using Bash's parameter expansion and unset all environment variables starting with BUILDWORKER_ prefix. Signed-off-by: Petr Å tetiar --- docker/buildworker/files/start.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/buildworker/files/start.sh b/docker/buildworker/files/start.sh index 1034407..5e0147a 100644 --- a/docker/buildworker/files/start.sh +++ b/docker/buildworker/files/start.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash +cleanup_buildworker_env_variables() { + for var in "${!BUILDWORKER_@}"; do + unset "$var" + done +} + [ -n "$BUILDWORKER_NAME" ] || { echo "Please supply a name via --env BUILDWORKER_NAME=XXX" >&2 exit 1 @@ -24,7 +30,6 @@ rm -f /builder/buildbot.tac echo "$BUILDWORKER_ADMIN" > /builder/info/admin echo "$BUILDWORKER_DESCRIPTION" > /builder/info/host -unset BUILDWORKER_ADMIN BUILDWORKER_DESCRIPTION BUILDWORKER_MASTER BUILDWORKER_NAME BUILDWORKER_PASSWORD - +cleanup_buildworker_env_variables rm -f /builder/twistd.pid exec /opt/venv/bin/buildbot-worker start --nodaemon /builder -- 2.30.2