github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-01 12:07:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: Pass all the control over the variables to the Variables class

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-10-28 20:51:54 -03:00
parent 6f617e6ca8
commit 787be98122
11 changed files with 316 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/rule.cc
View File

@@ -402,22 +402,22 @@ bool Rule::evaluate(Assay *assay) {
#ifndef NO_LOGS
assay->debug(4, "Executing chained rule.");
#endif
if (assay->update_variable_first("MATCHED_VAR",
if (assay->m_variables.storeOrUpdateFirst("MATCHED_VAR",
value) == false) {
assay->store_variable("MATCHED_VAR", value);
assay->m_variables.store("MATCHED_VAR", value);
}
if (assay->update_variable_first("MATCHED_VAR_NAME",
v->m_key) == false) {
assay->store_variable("MATCHED_VAR_NAME", v->m_key);
if (assay->m_variables.storeOrUpdateFirst(
"MATCHED_VAR_NAME", v->m_key) == false) {
assay->m_variables.store("MATCHED_VAR_NAME", v->m_key);
}
assay->store_variable("MATCHED_VARS:" + v->m_key, value);
assay->store_variable("MATCHED_VARS_NAMES:" + v->m_key,
assay->m_variables.store("MATCHED_VARS:" + v->m_key, value);
assay->m_variables.store("MATCHED_VARS_NAMES:" + v->m_key,
v->m_key);
chainResult = this->chainedRule->evaluate(assay);
assay->update_variable_first("MATCHED_VAR", "");
assay->delete_variable("MATCHED_VARS:" + v->m_key);
assay->delete_variable("MATCHED_VARS_NAMES:" + v->m_key);
assay->delete_variable("MATCHED_VARS_NAME");
assay->m_variables.storeOrUpdateFirst("MATCHED_VAR", "");
assay->m_variables.del("MATCHED_VARS:" + v->m_key);
assay->m_variables.del("MATCHED_VARS_NAMES:" + v->m_key);
assay->m_variables.del("MATCHED_VARS_NAME");
}
if (this->chained && chainResult == true || !this->chained) {
for (Action *a :