Skip to content

Warn about newlines in secrets (3.18) #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 11, 2023
Merged

Warn about newlines in secrets (3.18) #198

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bb5231
Default to sanitizing newlines in secrets
thespad Oct 31, 2023
7c6601c
Remove redundant if
thespad Nov 2, 2023
1b98fd9
Fix env enumeration
thespad Nov 2, 2023
6be18c0
Warn rather than sanitize
thespad Nov 11, 2023
0972696
!0 instead of 1
thespad Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions root/etc/s6-overlay/s6-rc.d/init-envfile/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash

if find /run/s6/container_environment/*"FILE__"* -maxdepth 1 > /dev/null 2>&1; then
for FILENAME in /run/s6/container_environment/*; do
if [[ "${FILENAME##*/}" == "FILE__"* ]]; then
if find /run/s6/container_environment/FILE__* -maxdepth 1 > /dev/null 2>&1; then
for FILENAME in /run/s6/container_environment/FILE__*; do
SECRETFILE=$(cat "${FILENAME}")
if [[ -f ${SECRETFILE} ]]; then
FILESTRIP=${FILENAME//FILE__/}
if [[ $(tail -n1 "${SECRETFILE}" | wc -l) != 0 ]]; then
echo "[env-init] Your secret: ${FILENAME##*/}"
echo " contains a trailing newline and may not work as expected"
fi
cat "${SECRETFILE}" >"${FILESTRIP}"
echo "[env-init] ${FILESTRIP##*/} set from ${FILENAME##*/}"
else
echo "[env-init] cannot find secret in ${FILENAME##*/}"
fi
fi
done
fi