From f2fb65c490c4a62ed51c9e82fa56543bcf69dcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20BENO=C3=8ET?= <tseeker@nocternity.net>
Date: Sat, 4 Jan 2025 13:24:53 +0100
Subject: [PATCH] fix: send the SMTP password as a secret

---
 docker/backend-entrypoint.sh | 7 ++++++-
 docker/compose.yml           | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker/backend-entrypoint.sh b/docker/backend-entrypoint.sh
index a28aff5..3dc1885 100755
--- a/docker/backend-entrypoint.sh
+++ b/docker/backend-entrypoint.sh
@@ -42,9 +42,14 @@ if ! [ -z "$LW_CONFIGURE" ]; then
 		<property name="port" value="${SMTP_PORT}" />
 EOF
 	if [ "$SMTP_AUTH" != "false" ]; then
+		if [ -z "$SMTP_PASSWORD_FILE" ]; then
+			password="$SMTP_PASSWORD"
+		else
+			password="`cat $SMTP_PASSWORD_FILE`"
+		fi
 		cat >>data-source.xml <<EOF
 		<property name="username" value="${SMTP_USER}" />
-		<property name="password" value="${SMTP_PASSWORD}" />
+		<property name="password" value="${password}" />
 EOF
 	fi
 	cat >>data-source.xml <<EOF
diff --git a/docker/compose.yml b/docker/compose.yml
index 8bedb63..1458d5c 100644
--- a/docker/compose.yml
+++ b/docker/compose.yml
@@ -38,9 +38,10 @@ services:
       SMTP_PORT: ${SMTP_PORT}
       SMTP_AUTH: ${SMTP_AUTH}
       SMTP_USER: ${SMTP_USER}
-      SMTP_PASSWORD: ${SMTP_PASSWORD}
+      SMTP_PASSWORD_FILE: /run/secrets/smtp_password
     secrets:
       - lw_db_password
+      - smtp_password
 
   web-main:
     build:
@@ -73,3 +74,5 @@ secrets:
     environment: DB_PASSWORD
   lw_db_password:
     environment: LW_DB_PASSWORD
+  smtp_password:
+    environment: SMTP_PASSWORD