github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-16 08:27:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renames class Assay to Transaction

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-01-13 14:38:37 -03:00
parent f3fd5d6621
commit a51e707517
249 changed files with 2961 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/variables/variable.cc
View File

@@ -20,7 +20,7 @@
#include <vector>
#include <list>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#include "variations/exclusion.h"
using modsecurity::Variables::Variations::Exclusion;
@@ -72,44 +72,44 @@ Variable::Variable(std::string name, VariableKind kind)
std::vector<const transaction::Variable *> *
Variable::evaluate(Assay *assay) {
Variable::evaluate(Transaction *transaction) {
std::vector<const transaction::Variable *> *l = NULL;
l = new std::vector<const transaction::Variable *>();
evaluate(assay, l);
evaluate(transaction, l);
return l;
}
void Variable::evaluateInternal(Assay *assay,
void Variable::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
if (m_collectionName.empty() == false) {
if (m_kind == CollectionVarible && m_type == MultipleMatches) {
assay->m_collections.resolveMultiMatches(m_name,
transaction->m_collections.resolveMultiMatches(m_name,
m_collectionName, l);
} else if (m_kind == CollectionVarible
&& m_type == RegularExpression) {
assay->m_collections.resolveRegularExpression(m_name,
transaction->m_collections.resolveRegularExpression(m_name,
m_collectionName, l);
} else {
assay->m_collections.resolveSingleMatch(m_name,
transaction->m_collections.resolveSingleMatch(m_name,
m_collectionName, l);
}
} else {
if (m_kind == CollectionVarible && m_type == MultipleMatches) {
assay->m_collections.resolveMultiMatches(m_name, l);
transaction->m_collections.resolveMultiMatches(m_name, l);
} else if (m_kind == CollectionVarible
&& m_type == RegularExpression) {
assay->m_collections.resolveRegularExpression(m_name, l);
transaction->m_collections.resolveRegularExpression(m_name, l);
} else {
assay->m_collections.resolveSingleMatch(m_name, l);
transaction->m_collections.resolveSingleMatch(m_name, l);
}
}
}
void Variable::evaluate(Assay *assay,
void Variable::evaluate(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
evaluateInternal(assay, l);
evaluateInternal(transaction, l);
}