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

Considering collection RULE independent of the case at macro expansion

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-09-12 15:27:03 -03:00
parent 241269eede
commit ad61838118
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/macro_expansion.cc
View File

@@ -19,6 +19,7 @@
#include "src/variables/rule.h" #include "src/variables/rule.h"
#include "src/variables/tx.h" #include "src/variables/tx.h"
#include "src/variables/highest_severity.h" #include "src/variables/highest_severity.h"
#include "src/utils.h"
namespace modsecurity { namespace modsecurity {
@@ -72,7 +73,7 @@ std::string MacroExpansion::expand(const std::string& input,
std::string var = std::string(variable, collection + 1, std::string var = std::string(variable, collection + 1,
variable.length() - (collection + 1)); variable.length() - (collection + 1));
if (col == "RULE") { if (toupper(col) == "RULE") {
if (rule == NULL) { if (rule == NULL) {
transaction->debug(9, "macro expansion: cannot resolve " \ transaction->debug(9, "macro expansion: cannot resolve " \
"RULE variable without the Rule object"); "RULE variable without the Rule object");
@@ -94,6 +95,12 @@ std::string MacroExpansion::expand(const std::string& input,
} }
} }
if (variableValue) {
transaction->debug(6, "Resolving: " + variable + " to: " +
*variableValue);
} else {
transaction->debug(6, "Resolving: " + variable + " to: NULL");
}
res.erase(start, end - start + 1); res.erase(start, end - start + 1);
if (res[start] == '%') { if (res[start] == '%') {
res.erase(start, 1); res.erase(start, 1);