Fix DATABASE_URL corruption from special characters in POSTGRES_PASSWORD

This commit is contained in:
2026-09-14 14:06:52 +02:00
parent 25eb7f50e6
commit 925f3111df
5 changed files with 44 additions and 4 deletions
+22 -2
View File
@@ -1,10 +1,30 @@
import os
from sqlalchemy import create_engine
from sqlalchemy.engine import URL
from sqlalchemy.orm import DeclarativeBase, Session, sessionmaker
DATABASE_URL = os.environ.get("DATABASE_URL", "sqlite:///./time_track.db")
engine = create_engine(DATABASE_URL, pool_pre_ping=True)
def build_database_url() -> URL | str:
"""Prefer DATABASE_URL; otherwise build a safely escaped URL from parts.
Passwords are passed as URL components (not string interpolation), so
characters like '@', ':', '/', '#' and '%' cannot corrupt the hostname.
"""
database_url = os.environ.get("DATABASE_URL")
if database_url:
return database_url
return URL.create(
"postgresql+psycopg",
username=os.environ.get("POSTGRES_USER", "time_track"),
password=os.environ.get("POSTGRES_PASSWORD", ""),
host=os.environ.get("POSTGRES_HOST", "localhost"),
port=int(os.environ.get("POSTGRES_PORT", "5432")),
database=os.environ.get("POSTGRES_DB", "time_track"),
)
engine = create_engine(build_database_url(), pool_pre_ping=True)
SessionLocal = sessionmaker(bind=engine, autocommit=False, autoflush=False)