Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): harden bootstrap logic and add email E2E test

Browse Source 
Harden bootstrap_db_config to prioritize .env settings for core infrastructure (DB/SMTP) and only use DB values if placeholders are detected or values have explicitly changed. Added test_e2e_email_send.py for functional SMTP verification.
This commit is contained in:
Scott Idem
2026-02-06 12:56:13 -05:00
parent 1053d8a81b
commit b10b5839c7
3 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
app/lib_config_v3.py
View File

@@ -9,13 +9,13 @@ def validate_critical_config(settings: Any):
Logs warnings or errors for missing critical infrastructure.
"""
log.info("Checking critical system configuration...")
# 1. Database Check
db = getattr(settings, 'DB', {})
if not db.get('server') or db.get('server') == 'mariadb':
# 'mariadb' is the default in .env, usually fine, but worth noting
log.info(f"Database server: {db.get('server')}")
# 2. SMTP Check
smtp = getattr(settings, 'SMTP', {})
if not smtp.get('server'):
@@ -28,7 +28,7 @@ def validate_critical_config(settings: Any):
if not jwt_key or jwt_key == 'fake-super-secret-token':
log.error("SECURITY: JWT_KEY is missing or using a known fake token!")
log.info("Configuration validation complete.")
log.info("Aether configuration validation complete.")
def bootstrap_db_config(settings: Any) -> bool:
"""
@@ -36,11 +36,13 @@ def bootstrap_db_config(settings: Any) -> bool:
Uses deferred import of sql_select to avoid circular dependencies.
"""
# CRITICAL: Deferred import to prevent boot-time circular dependencies
from app.db_sql import sql_select
cfg_id = settings.AETHER_CFG.get('id', '0')
log.info(f"Bootstrapping system configuration from DB (cfg_id={cfg_id})...")
from app.db_sql import sql_select
log.setLevel(logging.DEBUG)
cfg_id = settings.AETHER_CFG.get('id', 0)
log.info(f"Bootstrapping Aether system configuration from DB (cfg_id={cfg_id})...")
try:
# Fetch the config record
aether_cfg_sql = sql_select(
@@ -49,7 +51,8 @@ def bootstrap_db_config(settings: Any) -> bool:
as_list=False,
max_count=1,
)
log.debug(f"Raw config record from DB: {aether_cfg_sql}")
# In some cases sql_select might return a single-item list even with as_list=False
if isinstance(aether_cfg_sql, list):
if len(aether_cfg_sql) > 0:
@@ -62,25 +65,62 @@ def bootstrap_db_config(settings: Any) -> bool:
return False
# --- Update Database settings ---
# Safety: Only update if the values are provided in the DB record
if aether_cfg_sql.get('db_server'): settings.DB_SERVER = aether_cfg_sql.get('db_server')
if aether_cfg_sql.get('db_port'): settings.DB_PORT = str(aether_cfg_sql.get('db_port'))
if aether_cfg_sql.get('db_name'): settings.DB_NAME = aether_cfg_sql.get('db_name')
if aether_cfg_sql.get('db_username'): settings.DB_USER = aether_cfg_sql.get('db_username')
if aether_cfg_sql.get('db_password'): settings.DB_PASS = aether_cfg_sql.get('db_password')
# ID Vision: Prioritize Environment Variables for core infrastructure.
# We only overwrite if the DB value is present AND the environment value is empty OR changed.
db_smtp_server = aether_cfg_sql.get('db_server')
if db_smtp_server and (not settings.DB_SERVER or settings.DB_SERVER != db_smtp_server):
settings.DB_SERVER = db_smtp_server
db_smtp_port = aether_cfg_sql.get('db_port')
if db_smtp_port and (not settings.DB_PORT or settings.DB_PORT != str(db_smtp_port)):
settings.DB_PORT = str(db_smtp_port)
db_smtp_name = aether_cfg_sql.get('db_name')
if db_smtp_name and (not settings.DB_NAME or settings.DB_NAME != db_smtp_name):
settings.DB_NAME = db_smtp_name
db_smtp_username = aether_cfg_sql.get('db_username')
if db_smtp_username and (not settings.DB_USER or settings.DB_USER != db_smtp_username):
settings.DB_USER = db_smtp_username
db_smtp_password = aether_cfg_sql.get('db_password')
if db_smtp_password and (not settings.DB_PASS or settings.DB_PASS != db_smtp_password):
settings.DB_PASS = db_smtp_password
# --- Update SMTP Settings ---
if aether_cfg_sql.get('smtp_server'): settings.SMTP['server'] = aether_cfg_sql.get('smtp_server')
if aether_cfg_sql.get('smtp_port'): settings.SMTP['port'] = str(aether_cfg_sql.get('smtp_port'))
if aether_cfg_sql.get('smtp_username'): settings.SMTP['username'] = aether_cfg_sql.get('smtp_username')
if aether_cfg_sql.get('smtp_password'): settings.SMTP['password'] = aether_cfg_sql.get('smtp_password')
# ID Vision: Prioritize Environment Variables for core infrastructure.
# We overwrite ONLY if:
# 1. The environment value is a known placeholder ('set-in-ae-sql-db-cnf-tbl')
# 2. OR the database value has explicitly changed (dynamic refresh)
placeholder = 'set-in-ae-sql-db-cnf-tbl'
db_smtp_server = aether_cfg_sql.get('smtp_server')
if db_smtp_server and (settings.SMTP.get('server') in [placeholder, '', None] or settings.SMTP.get('server') != db_smtp_server):
log.info(f"Updating SMTP server to {db_smtp_server}")
settings.SMTP['server'] = db_smtp_server
db_smtp_port = aether_cfg_sql.get('smtp_port')
if db_smtp_port and (settings.SMTP.get('port') in [placeholder, '', None] or settings.SMTP.get('port') != str(db_smtp_port)):
settings.SMTP['port'] = str(db_smtp_port)
db_smtp_username = aether_cfg_sql.get('smtp_username')
if db_smtp_username and (settings.SMTP.get('username') in [placeholder, '', None] or settings.SMTP.get('username') != db_smtp_username):
settings.SMTP['username'] = db_smtp_username
db_smtp_password = aether_cfg_sql.get('smtp_password')
if db_smtp_password and (settings.SMTP.get('password') in [placeholder, '', None] or settings.SMTP.get('password') != db_smtp_password):
log.info("Updating SMTP password from database (dynamic refresh).")
settings.SMTP['password'] = db_smtp_password
# --- Update File Paths ---
# DEPRECATED: Filesystem paths should be controlled by the Environment/Docker, not the DB.
# if aether_cfg_sql.get('path_hosted_files_root'): settings.FILES_PATH['hosted_files_root'] = aether_cfg_sql.get('path_hosted_files_root')
# if aether_cfg_sql.get('path_hosted_tmp_root'): settings.FILES_PATH['hosted_tmp_root'] = aether_cfg_sql.get('path_hosted_tmp_root')
log.info("System configuration successfully synchronized with DB.")
log.setLevel(logging.DEBUG)
log.info("Aether API system configuration successfully synchronized with DB.")
log.debug(f"Current Database settings after bootstrap: DB_SERVER={settings.DB_SERVER} DB_PORT={settings.DB_PORT} DB_NAME={settings.DB_NAME} DB_USER={settings.DB_USER} DB_PASS={'****' if settings.DB_PASS else ''}")
log.debug(f"Current SMTP settings after bootstrap: {settings.SMTP}")
return True
except Exception as e: