github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 11:44:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rsub escaping

Browse Source
This commit is contained in:
brenosilva
2011-03-31 17:51:37 +00:00
parent 4aba02a102
commit 9ddad65f0c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apache2/re_operators.c
View File

@@ -671,7 +671,6 @@ static int msre_op_rsub_execute(modsec_rec *msr, msre_rule *rule, msre_var *var,
msr_log(msr,9,"Operator rsub only works with STREAM_* variables"); msr_log(msr,9,"Operator rsub only works with STREAM_* variables");
return -1; return -1;
} }
if(rule->re_precomp == 1) { if(rule->re_precomp == 1) {
re_pattern->value = apr_pstrndup(msr->mp, rule->re_str, strlen(rule->re_str)); re_pattern->value = apr_pstrndup(msr->mp, rule->re_str, strlen(rule->re_str));
re_pattern->value_len = strlen(re_pattern->value); re_pattern->value_len = strlen(re_pattern->value);
@@ -679,8 +678,15 @@ static int msre_op_rsub_execute(modsec_rec *msr, msre_rule *rule, msre_var *var,
expand_macros(msr, re_pattern, rule, msr->mp); expand_macros(msr, re_pattern, rule, msr->mp);
if(strlen(re_pattern->value) > 0) { if(strlen(re_pattern->value) > 0) {
if(rule->escape_re == 1) {
pattern = log_escape_re(msr->mp, re_pattern->value); pattern = log_escape_re(msr->mp, re_pattern->value);
if (msr->txcfg->debuglog_level >= 6) {
msr_log(msr, 6, "Escaping pattern [%s]",pattern);
}
rule->sub_regex = ap_pregcomp(msr->mp, pattern, AP_REG_EXTENDED); rule->sub_regex = ap_pregcomp(msr->mp, pattern, AP_REG_EXTENDED);
} else {
rule->sub_regex = ap_pregcomp(msr->mp, re_pattern->value, AP_REG_EXTENDED);
}
} }
else { else {
rule->sub_regex = NULL; rule->sub_regex = NULL;