aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Use consistent value representation in MCP query rules

Browse Source 
`mcp_query_rules` and `runtime_mcp_query_rules` uses different
representations for the same fields, causing the web UI to always
report config differences even after loading to runtime.

- Use `-1` sentinel for nullable int fields (`flagOUT`, `timeout_ms`,
  `log`) so `NULL` values from main are preserved when written to
  runtime, following the `MySQL QP_rule_t` pattern.
- Serialize `re_modifiers` bitmask back to `VARCHAR` (`1→"CASELESS"`)
  to match the format used in main table
- Update `evaluate_mcp_query_rules()` to handle tri-state log field

Signed-off-by: Wazir Ahmed <wazir@proxysql.com>
pull/5420/head
Wazir Ahmed 3 months ago
parent c05bc66655
commit daa0b2037e
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File

6
include/Discovery_Schema.h
Unescape View File

@ -38,7 +38,7 @@ struct MCP_Query_Rule {
int timeout_ms;
char *error_msg;
char *ok_msg;
bool log;
int log; // tri-state: -1=unset(NULL), 0=don't log, 1=log
bool apply;
char *comment;
uint64_t hits; // in-memory only, not persisted to table
@ -46,8 +46,8 @@ struct MCP_Query_Rule {
MCP_Query_Rule() : rule_id(0), active(false), username(NULL), target_id(NULL), schemaname(NULL),
tool_name(NULL), match_pattern(NULL), negate_match_pattern(false),
re_modifiers(1), flagIN(0), flagOUT(0), replace_pattern(NULL),
timeout_ms(0), error_msg(NULL), ok_msg(NULL), log(false), apply(true),
re_modifiers(1), flagIN(0), flagOUT(-1), replace_pattern(NULL),
timeout_ms(-1), error_msg(NULL), ok_msg(NULL), log(-1), apply(true),
comment(NULL), hits(0), regex_engine(NULL) {}
};

29
lib/Discovery_Schema.cpp
Unescape View File

@ -2528,7 +2528,7 @@ void Discovery_Schema::load_mcp_query_rules(SQLite3_result* resultset) {
// negate_match_pattern, re_modifiers, flagIN, flagOUT, replace_pattern,
// timeout_ms, error_msg, OK_msg, log, apply, comment
// Expected: 18 columns (fields[0] through fields[17])
for (unsigned int i = 0; i < resultset->rows_count; i++) {
for (int i = 0; i < resultset->rows_count; i++) {
SQLite3_row* row = resultset->rows[i];
// Validate column count before accessing fields
@ -2562,12 +2562,12 @@ void Discovery_Schema::load_mcp_query_rules(SQLite3_result* resultset) {
rule->re_modifiers = 1; // default CASELESS
}
rule->flagIN = row->fields[9] ? atoi(row->fields[9]) : 0; // flagIN
rule->flagOUT = row->fields[10] ? atoi(row->fields[10]) : 0; // flagOUT
rule->flagOUT = row->fields[10] ? atoi(row->fields[10]) : -1; // flagOUT: -1 = NULL/unset
rule->replace_pattern = row->fields[11] ? strdup(row->fields[11]) : NULL; // replace_pattern
rule->timeout_ms = row->fields[12] ? atoi(row->fields[12]) : 0; // timeout_ms
rule->timeout_ms = row->fields[12] ? atoi(row->fields[12]) : -1; // timeout_ms: -1 = NULL/unset
rule->error_msg = row->fields[13] ? strdup(row->fields[13]) : NULL; // error_msg
rule->ok_msg = row->fields[14] ? strdup(row->fields[14]) : NULL; // OK_msg
rule->log = row->fields[15] ? atoi(row->fields[15]) != 0 : false; // log
rule->log = row->fields[15] ? atoi(row->fields[15]) : -1; // log: -1 = NULL/unset
rule->apply = row->fields[16] ? atoi(row->fields[16]) != 0 : true; // apply
rule->comment = row->fields[17] ? strdup(row->fields[17]) : NULL; // comment
// Note: hits is in-memory only, not loaded from table
@ -2711,12 +2711,12 @@ MCP_Query_Processor_Output* Discovery_Schema::evaluate_mcp_query_rules(
// Collect rule actions in output object
if (!rule->apply) {
// Log-only rule, continue processing
if (rule->log) {
if (rule->log > 0) {
proxy_info("MCP query rule %d logged: tool=%s schema=%s\n",
rule->rule_id, tool_name.c_str(), schemaname.c_str());
}
if (qpo->log == -1) {
qpo->log = rule->log ? 1 : 0;
if (rule->log >= 0 && qpo->log == -1) {
qpo->log = rule->log;
}
continue;
}
@ -2787,7 +2787,7 @@ MCP_Query_Processor_Output* Discovery_Schema::evaluate_mcp_query_rules(
}
// 5. Log flag
if (rule->log && qpo->log == -1) {
if (rule->log > 0 && qpo->log == -1) {
qpo->log = 1;
}
@ -2856,14 +2856,19 @@ SQLite3_result* Discovery_Schema::get_mcp_query_rules() {
pta[5] = rule->tool_name ? strdup(rule->tool_name) : NULL; // tool_name
pta[6] = rule->match_pattern ? strdup(rule->match_pattern) : NULL; // match_pattern
pta[7] = strdup(std::to_string(rule->negate_match_pattern ? 1 : 0).c_str()); // negate_match_pattern
pta[8] = strdup(std::to_string(rule->re_modifiers).c_str()); // re_modifiers
// re_modifiers: reverse map bitmask back to string (matching MySQL pattern)
if (rule->re_modifiers & 1) { // CASELESS bitmask
pta[8] = strdup("CASELESS");
} else {
pta[8] = strdup(std::to_string(rule->re_modifiers).c_str());
}
pta[9] = strdup(std::to_string(rule->flagIN).c_str()); // flagIN
pta[10] = strdup(std::to_string(rule->flagOUT).c_str()); // flagOUT
pta[10] = (rule->flagOUT == -1) ? NULL : strdup(std::to_string(rule->flagOUT).c_str()); // flagOUT: -1 = NULL
pta[11] = rule->replace_pattern ? strdup(rule->replace_pattern) : NULL; // replace_pattern
pta[12] = strdup(std::to_string(rule->timeout_ms).c_str()); // timeout_ms
pta[12] = (rule->timeout_ms == -1) ? NULL : strdup(std::to_string(rule->timeout_ms).c_str()); // timeout_ms: -1 = NULL
pta[13] = rule->error_msg ? strdup(rule->error_msg) : NULL; // error_msg
pta[14] = rule->ok_msg ? strdup(rule->ok_msg) : NULL; // OK_msg
pta[15] = strdup(std::to_string(rule->log ? 1 : 0).c_str()); // log
pta[15] = (rule->log == -1) ? NULL : strdup(std::to_string(rule->log).c_str()); // log: -1 = NULL
pta[16] = strdup(std::to_string(rule->apply ? 1 : 0).c_str()); // apply
pta[17] = rule->comment ? strdup(rule->comment) : NULL; // comment

Write Preview
Loading…
Cancel
Save