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

Remove logdata and msg fields from JSON audit log rule elements

Browse Source 
Writing macro-expanded strings to JSON elements during the post-logging
phase can be misleading, because it's possible that variable contents
(such as MATCHED_VAR) could have changed after the rule match, altering
their expected contents. Writing macro-epanded audit data really only
makes sense when the macros are expanded immediately following the
rule match. See issue #1174 for more details.
This commit is contained in:
Robert Paprocki 2016-07-19 09:08:58 -07:00 committed by Felipe Zimmerle
parent 5f4a098f08
commit 2b4ece14c6
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apache2/msc_logging.c
View File

@ -559,36 +559,9 @@ static void write_rule_json(modsec_rec *msr, const msre_rule *rule, yajl_gen g)
if (rule->actionset->rev) { if (rule->actionset->rev) {
yajl_kv_string(g, "rev", log_escape(msr->mp, rule->actionset->rev)); yajl_kv_string(g, "rev", log_escape(msr->mp, rule->actionset->rev));
} }
if (rule->actionset->msg) {
msc_string *var = (msc_string *)apr_palloc(msr->mp, sizeof(msc_string));
var->value = (char *)rule->actionset->msg;
var->value_len = strlen(rule->actionset->msg);
expand_macros(msr, var, NULL, msr->mp);
yajl_kv_string(g, "msg", log_escape_ex(msr->mp, var->value, var->value_len));
}
if (rule->actionset->version) { if (rule->actionset->version) {
yajl_kv_string(g, "version", log_escape(msr->mp, rule->actionset->version)); yajl_kv_string(g, "version", log_escape(msr->mp, rule->actionset->version));
} }
if (rule->actionset->logdata) {
char *logdata = NULL;
msc_string *var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
var->value = (char *)rule->actionset->logdata;
var->value_len = strlen(rule->actionset->logdata);
expand_macros(msr, var, NULL, msr->mp);
logdata = apr_pstrdup(msr->mp, log_escape_hex(msr->mp, (unsigned char *)var->value, var->value_len));
// if it is > 512 bytes, then truncate at 512 with ellipsis.
if (strlen(logdata) > 515) {
logdata[512] = '.';
logdata[513] = '.';
logdata[514] = '.';
logdata[515] = '\0';
}
yajl_kv_string(g, "logdata", logdata);
}
if (rule->actionset->severity != NOT_SET) { if (rule->actionset->severity != NOT_SET) {
yajl_kv_int(g, "severity", rule->actionset->severity); yajl_kv_int(g, "severity", rule->actionset->severity);
} }