3 Commits (ea7cbaff53a7e32826e743e34dfd0cb8bb3923bf)

Author	SHA1	Message	Date
Rene Cannao	253d098653	security: fix SQL injection vulnerabilities in SQLite catalog queries ... Address Gemini Code Assist review feedback on PR #5386: 1. Discovery_Schema::resolve_run_id - Replace string concatenation with replace_str escaping with proper parameterized queries using sqlite3_prepare_v2 and sqlite3_bind_* functions. 2. PgSQL_Static_Harvester - Remove unsafe escape_sql_string() function and replace its usages with: - New lookup_object_id() helper using parameterized queries - Parameterized UPDATE statements in harvest_view_definitions() These changes ensure complete protection against SQL injection for the catalog database, following the pattern already used in create_run().	4 months ago
Rene Cannao	2fa1401b05	MCP query+harvest hardening: HGM-based target routing, weighted backend selection, pgsql schema fix, and TAP robustness ... This squashed commit consolidates the recent MCP stabilization work across query execution and static-discovery tests. 1) Query endpoint routing/executability now uses Hostgroup Manager runtime snapshots - File: lib/Query_Tool_Handler.cpp - Removed dependency on direct SQL probes against runtime_mysql_servers/runtime_pgsql_servers from inside the MCP query handler path. - Target backend resolution now reuses the same Hostgroup Manager runtime snapshot APIs that feed Admin runtime server visibility: - MyHGM->dump_table_mysql("mysql_servers") - PgHGM->dump_table_pgsql("pgsql_servers") - Non-executable diagnostics now summarize statuses from HGM snapshots instead of ad hoc runtime-table SQL. 2) Backend endpoint selection changed to weighted random - File: lib/Query_Tool_Handler.cpp - Selection remains constrained by: - matching target hostgroup_id - ONLINE backend status - Candidate choice now uses random selection with linear probability by weight, replacing deterministic ordering. 3) Read-only validation and guardrail adjustments - File: lib/Query_Tool_Handler.cpp - Fixed false negatives for valid read-only queries such as SELECT literals (no FROM clause required). - Added additional dangerous-query patterns for file-write variants: - INTO OUTFILE - INTO DUMPFILE 4) PostgreSQL static harvester schema query fix - File: lib/PgSQL_Static_Harvester.cpp - Fixed harvest_schemas() failure on PostgreSQL caused by querying non-existent information_schema.schemata.default_collation_name. - Replaced with PostgreSQL-safe projection while preserving the insert_schema() column contract. 5) TAP reliability improvements for MCP test phases - File: test/tap/tests/mcp_rules_testing/test_phase11_pgsql_target.sh - Isolated phase state by clearing MCP rules before setup. - Added verbose response prints for T11.1-T11.4. - Added LOGENTRY phase start/end markers and EXIT trap for guaranteed end watermark. - Replaced fragile grep/escaping checks with robust string assertions. - Fixed NULL-concat stats assertions with COALESCE(username,'') and COALESCE(target_id,''). - File: test/tap/tests/test_mcp_static_harvest-t.sh - Hardened escaped-JSON parsing in MCP response checks (run_id extraction + key/value assertions). - Reworked target/protocol/object assertions to avoid transport-format false negatives. - Corrected cross-target negative assertion to check MCP isError semantics. Observed result in user verification - Phase 11 pgsql target/rules/stats checks pass. - Static harvest phase-A checks pass for mixed mysql/pgsql target_id flow. This commit intentionally keeps runtime ONLINE-only target executability semantics and improves observability/diagnostic quality for future MCP routing/test failures.	4 months ago
Rene Cannao	9685cdaa4b	mcp discovery: enforce target-scoped run model and add protocol-aware static harvesting (mysql+pgsql) ... Refactor the MCP query/discovery stack to remove prototype-era MySQL-only assumptions and make discovery/catalog semantics explicitly target-scoped. This commit is intentionally not backward compatible with legacy single-target catalog metadata. Key implementation details: - Discovery_Schema: - runs table now stores target_id, protocol, and server_version - resolve_run_id() now requires target_id and resolves schemas within target scope - create_run() now records target/protocol/server version - added legacy schema detection + destructive catalog table rebuild when old runs layout is found - fixed resultset lifetime/escaping issues in target-aware run resolution - New PostgreSQL static harvester: - added PgSQL_Static_Harvester class and build wiring - harvests schemas/objects/columns/indexes/fks/view definitions into Discovery_Schema - maps pg metadata to object_id-based insert APIs used by Discovery_Schema - Query_Tool_Handler: - constructor simplified to catalog_path only (no mcp-mysql_* runtime ctor deps) - discovery.run_static now requires target_id and dispatches protocol-aware harvester at runtime - catalog.*, agent.run_start, and llm.* tool contracts now require target_id when resolving run_id - all run_id resolution call sites switched to resolve_run_id(target_id, ...) - list_schemas catalog query now scoped by target_id via runs join - digest logging path now resolves run_id in target context - ProxySQL_MCP_Server: - updated Query_Tool_Handler construction to new signature - Docs updated: - added explicit target_id scoping guidance for discovery/catalog/agent/llm workflows - clarified protocol-aware routing and noted legacy examples still present in large script docs Build validation: - Recompiled changed objects with PROXYSQLGENAI=1: - Query_Tool_Handler.oo - Discovery_Schema.oo - PgSQL_Static_Harvester.oo - ProxySQL_MCP_Server.oo	4 months ago