Simon/romm
1
0
Fork 0
mirror of https://github.com/rommapp/romm.git synced 2026-03-03 02:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make default ROMM_AUTH_SECRET_KEY consistent between workers

Browse Source
This commit is contained in:
Georges-Antoine Assi
2025-08-15 12:46:46 -04:00
parent c075da089b
commit a1519a4b05
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/config/__init__.py
View File

@@ -1,5 +1,4 @@
import os import os
import secrets
from typing import Final from typing import Final
import yarl import yarl
@@ -9,7 +8,7 @@ load_dotenv()
def str_to_bool(value: str) -> bool: def str_to_bool(value: str) -> bool:
return value.lower() in ("true", "1") return value.strip().lower() in ("1", "true", "yes", "on")
ROMM_BASE_URL = os.environ.get("ROMM_BASE_URL", "http://0.0.0.0") ROMM_BASE_URL = os.environ.get("ROMM_BASE_URL", "http://0.0.0.0")
@@ -98,9 +97,8 @@ HASHEOUS_API_ENABLED: Final = str_to_bool(
TGDB_API_ENABLED: Final = str_to_bool(os.environ.get("TGDB_API_ENABLED", "false")) TGDB_API_ENABLED: Final = str_to_bool(os.environ.get("TGDB_API_ENABLED", "false"))
# AUTH # AUTH
ROMM_AUTH_SECRET_KEY: Final = os.environ.get( ROMM_AUTH_SECRET_KEY: Final = os.environ.get("ROMM_AUTH_SECRET_KEY")
"ROMM_AUTH_SECRET_KEY", secrets.token_hex(32)
)
SESSION_MAX_AGE_SECONDS: Final = int( SESSION_MAX_AGE_SECONDS: Final = int(
os.environ.get("SESSION_MAX_AGE_SECONDS", 14 * 24 * 60 * 60) os.environ.get("SESSION_MAX_AGE_SECONDS", 14 * 24 * 60 * 60)
) # 14 days, in seconds ) # 14 days, in seconds

7
docker/init_scripts/init
View File

@@ -275,6 +275,13 @@ if ! printenv | grep -q '^OTEL_'; then
export OTEL_SDK_DISABLED=true export OTEL_SDK_DISABLED=true
fi fi
# Set ROMM_AUTH_SECRET_KEY if not already set
if [[ -z ${ROMM_AUTH_SECRET_KEY} ]]; then
ROMM_AUTH_SECRET_KEY=$(python3 -c "import secrets; print(secrets.token_hex(32))")
info_log "ROMM_AUTH_SECRET_KEY not set, generating random secret key"
export ROMM_AUTH_SECRET_KEY
fi
# Start Valkey server if REDIS_HOST is not set (which would mean user is using an external Redis/Valkey) # Start Valkey server if REDIS_HOST is not set (which would mean user is using an external Redis/Valkey)
if [[ -z ${REDIS_HOST} ]]; then if [[ -z ${REDIS_HOST} ]]; then
watchdog_process_pid valkey-server watchdog_process_pid valkey-server

7
entrypoint.sh
View File

@@ -1,5 +1,4 @@
#!/bin/bash #!/bin/bash
# trunk-ignore-all(shellcheck/SC2016)
set -e set -e
@@ -33,6 +32,12 @@ function handle_termination() {
# Trap SIGTERM and SIGINT signals # Trap SIGTERM and SIGINT signals
trap handle_termination SIGTERM SIGINT trap handle_termination SIGTERM SIGINT
# Set ROMM_AUTH_SECRET_KEY if not already set
if [[ -z ${ROMM_AUTH_SECRET_KEY} ]]; then
ROMM_AUTH_SECRET_KEY=$(python3 -c "import secrets; print(secrets.token_hex(32))")
export ROMM_AUTH_SECRET_KEY
fi
# Start all services in the background # Start all services in the background
echo "Starting backend..." echo "Starting backend..."
cd /app/backend cd /app/backend