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: Place m_variables inside Collections

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-10-29 12:39:09 -03:00
parent 787be98122
commit b6ae0585cd
13 changed files with 253 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rule.cc
View File

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