github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add the file/line to the rule so we can use it in the debug log and eventually in the alerts.

Browse Source
This commit is contained in:
brectanus 2007-03-21 21:20:35 +00:00
parent 58afede3f3
commit 4676132ed4
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -2,6 +2,10 @@
21 Mar 2007 - trunk 21 Mar 2007 - trunk
------------------- -------------------
* Store filename/line for each rule and display it and the ID (if available)
in the debug log when invoking a rule. Thanks to Christian Bockermann
for the idea.
* Do not log 'allow' action as intercepted in the debug log. * Do not log 'allow' action as intercepted in the debug log.
* Optimize regex execution to not capture unless 'capture' action used. * Optimize regex execution to not capture unless 'capture' action used.

2
apache2/apache2_config.c
View File

@ -422,7 +422,7 @@ static const char *add_rule(cmd_parms *cmd, directory_config *dcfg, const char *
} }
/* Create the rule now. */ /* Create the rule now. */
rule = msre_rule_create(dcfg->ruleset, p1, p2, p3, &my_error_msg); rule = msre_rule_create(dcfg->ruleset, cmd->directive->filename, cmd->directive->line_num, p1, p2, p3, &my_error_msg);
if (rule == NULL) { if (rule == NULL) {
return my_error_msg; return my_error_msg;
} }

17
apache2/re.c
View File

@ -703,7 +703,17 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr)
} }
if (msr->txcfg->debuglog_level >= 4) { if (msr->txcfg->debuglog_level >= 4) {
msr_log(msr, 4, "Recipe: Invoking rule %x.", rule); apr_pool_t *p = msr->mp;
const char *fn = NULL;
const char *id = NULL;
if (rule->filename != NULL) {
fn = apr_psprintf(p, " [%s:%d]", rule->filename, rule->line_num);
}
if (rule->actionset != NULL && rule->actionset->id != NULL) {
id = apr_psprintf(p, " [id \"%s\"]", rule->actionset->id);
}
msr_log(msr, 4, "Recipe: Invoking rule %x%s%s.",
rule, (fn ? fn : ""), (id ? id : ""));
} }
rc = msre_rule_process(rule, msr); rc = msre_rule_process(rule, msr);
@ -1008,7 +1018,8 @@ char *msre_format_metadata(modsec_rec *msr, msre_actionset *actionset) {
* Assembles a new rule using the strings that contain a list * Assembles a new rule using the strings that contain a list
* of targets (variables), argumments, and actions. * of targets (variables), argumments, and actions.
*/ */
msre_rule *msre_rule_create(msre_ruleset *ruleset, const char *targets, msre_rule *msre_rule_create(msre_ruleset *ruleset,
const char *fn, int line, const char *targets,
const char *args, const char *actions, char **error_msg) const char *args, const char *actions, char **error_msg)
{ {
msre_rule *rule; msre_rule *rule;
@ -1023,6 +1034,8 @@ msre_rule *msre_rule_create(msre_ruleset *ruleset, const char *targets,
if (rule == NULL) return NULL; if (rule == NULL) return NULL;
rule->ruleset = ruleset; rule->ruleset = ruleset;
rule->targets = apr_array_make(ruleset->mp, 10, sizeof(const msre_var *)); rule->targets = apr_array_make(ruleset->mp, 10, sizeof(const msre_var *));
rule->filename = apr_pstrdup(ruleset->mp, fn);
rule->line_num = line;
/* Parse targets */ /* Parse targets */
rc = msre_parse_targets(ruleset, targets, rule->targets, &my_error_msg); rc = msre_parse_targets(ruleset, targets, rule->targets, &my_error_msg);

5
apache2/re.h
View File

@ -119,12 +119,15 @@ struct msre_rule {
msre_op_metadata *op_metadata; msre_op_metadata *op_metadata;
unsigned int op_negated; unsigned int op_negated;
msre_actionset *actionset; msre_actionset *actionset;
const char *filename;
int line_num;
msre_ruleset *ruleset; msre_ruleset *ruleset;
msre_rule *chain_starter; msre_rule *chain_starter;
}; };
msre_rule *msre_rule_create(msre_ruleset *ruleset, const char *targets, msre_rule *msre_rule_create(msre_ruleset *ruleset,
const char *fn, int line, const char *targets,
const char *args, const char *actions, char **error_msg); const char *args, const char *actions, char **error_msg);
void msre_rule_actionset_init(msre_rule *rule); void msre_rule_actionset_init(msre_rule *rule);