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

Revert "support macro expansion in @rx"

Browse Source 
This reverts commit a76030256ea914ca7bedf1a6636b4a3e3afa8713.
This commit is contained in:
Felipe Zimmerle 2017-12-28 23:09:10 -03:00
parent c0c19e3a99
commit f9abf279e2
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/operators/rx.cc
View File

@ -33,19 +33,12 @@ bool Rx::evaluate(Transaction *transaction, Rule *rule,
const std::string& input, std::shared_ptr<RuleMessage> ruleMessage) { const std::string& input, std::shared_ptr<RuleMessage> ruleMessage) {
SMatch match; SMatch match;
std::list<SMatch> matches; std::list<SMatch> matches;
Regex * re = m_re;
if (m_param.empty()) { if (m_param.empty()) {
return true; return true;
} }
std::string eparam = MacroExpansion::expand(m_param, transaction); matches = m_re->searchAll(input);
if (eparam != m_param) {
re = new Regex(eparam);
}
matches = re->searchAll(input);
if (rule && rule->getActionsByName("capture").size() > 0 && transaction) { if (rule && rule->getActionsByName("capture").size() > 0 && transaction) {
int i = 0; int i = 0;
matches.reverse(); matches.reverse();
@ -65,10 +58,6 @@ bool Rx::evaluate(Transaction *transaction, Rule *rule,
logOffset(ruleMessage, i.m_offset, i.m_length); logOffset(ruleMessage, i.m_offset, i.m_length);
} }
if (re != m_re) {
delete re;
}
if (matches.size() > 0) { if (matches.size() > 0) {
return true; return true;
} }