π OpenHands: AI-Driven Development
fix(security): suppress SQLAlchemy DEBUG logging that leaks credentials (#13719)
simonrosenberg20018842a4e3
diff --git a/enterprise/alembic.ini b/enterprise/alembic.iniindex 0b14d812b1..b0eed72208 100644--- a/enterprise/alembic.ini+++ b/enterprise/alembic.ini@@ -59,7 +59,7 @@ handlers = consolequalname =[logger_sqlalchemy]-level = DEBUG+level = WARNINGhandlers =qualname = sqlalchemy.enginediff --git a/enterprise/migrations/env.py b/enterprise/migrations/env.pyindex 23daa3a28d..bd0f2a6bfe 100644--- a/enterprise/migrations/env.py+++ b/enterprise/migrations/env.py@@ -6,6 +6,12 @@ from logging.config import fileConfig# These plugin setup messages would otherwise appear before logging is configuredlogging.getLogger('alembic.runtime.plugins').setLevel(logging.WARNING)+# Prevent SQLAlchemy engine from logging SQL results at DEBUG level, which can+# leak sensitive column data (e.g. API keys, tokens) into log aggregators.+# This is set before any engine is created so it takes effect immediately.+logging.getLogger('sqlalchemy.engine').setLevel(logging.WARNING)+logging.getLogger('sqlalchemy.engine.Engine').setLevel(logging.WARNING)+from alembic import context # noqa: E402from google.cloud.sql.connector import Connector # noqa: E402from sqlalchemy import create_engine, text # noqa: E402@@ -70,6 +76,12 @@ config = context.configif config.config_file_name is not None:fileConfig(config.config_file_name)+# Re-apply SQLAlchemy engine log suppression after fileConfig, which may override+# our earlier settings from alembic.ini. This ensures DEBUG-level SQL result logging+# is always suppressed, preventing sensitive data from leaking into log aggregators.+logging.getLogger('sqlalchemy.engine').setLevel(logging.WARNING)+logging.getLogger('sqlalchemy.engine.Engine').setLevel(logging.WARNING)+def run_migrations_offline() -> None:"""Run migrations in 'offline' mode.diff --git a/enterprise/migrations/versions/103_add_mcp_config_to_org_member.py b/enterprise/migrations/versions/103_add_mcp_config_to_org_member.pyindex d3b2f75272..d1a6df401f 100644--- a/enterprise/migrations/versions/103_add_mcp_config_to_org_member.py+++ b/enterprise/migrations/versions/103_add_mcp_config_to_org_member.py@@ -6,7 +6,6 @@ Create Date: 2026-03-26"""-import jsonfrom typing import Sequence, Unionimport sqlalchemy as sa@@ -24,18 +23,18 @@ def upgrade() -> None:# Migrate existing org-level MCP configs to all members in each org.# This preserves existing configurations while transitioning to user-specific settings.- conn = op.get_bind()- orgs_with_config = conn.execute(- sa.text('SELECT id, mcp_config FROM org WHERE mcp_config IS NOT NULL')- ).fetchall()-- for org_id, mcp_config in orgs_with_config:- conn.execute(- sa.text(- 'UPDATE org_member SET mcp_config = :config WHERE org_id = :org_id'- ),- {'config': json.dumps(mcp_config), 'org_id': str(org_id)},+ # Uses server-side SQL to avoid pulling sensitive config data into the Python process.+ op.execute(+ sa.text(+ """+ UPDATE org_member+ SET mcp_config = org.mcp_config+ FROM org+ WHERE org_member.org_id = org.id+ AND org.mcp_config IS NOT NULL+ """)+ )def downgrade() -> None: