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

Adds support to macro expansion in setvar action

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-08-07 00:43:16 -03:00
parent e12d95b10d
commit 5fdb5b7d2e
7 changed files with 306 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/actions/set_var.cc
View File

@@ -20,6 +20,7 @@
#include "modsecurity/assay.h"
#include "src/rule.h"
#include "src/macro_expansion.h"
namespace ModSecurity {
namespace actions {
@@ -94,6 +95,7 @@ void SetVar::dump() {
bool SetVar::evaluate(Rule *rule, Assay *assay) {
std::string targetValue;
variableName = MacroExpansion::expand(variableName, assay);
int value = 0;
try {
std::string *resolvedValue =
@@ -111,14 +113,16 @@ bool SetVar::evaluate(Rule *rule, Assay *assay) {
try {
pre = stoi(predicate);
} catch (...) {
/* perform a macro expansion. */
pre = 0;
try {
pre = stoi(MacroExpansion::expand(predicate, assay));
} catch (...) {
pre = 0;
}
}
switch (operation) {
case setOperation:
/* perform a macro expansion. */
targetValue = predicate;
targetValue = MacroExpansion::expand(predicate, assay);
break;
case sumAndSetOperation:
targetValue = std::to_string(value + pre);