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

Code cosmetics

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-11-18 12:59:08 -03:00
parent 3c45a57130
commit de79848285
11 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/variables/variable.cc
View File

@@ -34,7 +34,6 @@ Variable::Variable(std::string name)
m_collectionName(""),
m_isExclusion(false),
m_isCount(false) {
if (m_name.at(0) == '\\') {
m_type = RegularExpression;
} else if (m_name.find(":") != std::string::npos) {
@@ -58,7 +57,6 @@ Variable::Variable(std::string name, VariableKind kind)
m_kind(kind),
m_isExclusion(false),
m_isCount(false) {
if (m_name.at(0) == '\\') {
m_type = RegularExpression;
} else if (m_name.find(":") != std::string::npos) {
@@ -75,25 +73,32 @@ Variable::Variable(std::string name, VariableKind kind)
std::vector<const transaction::Variable *> *
Variable::evaluate(Assay *assay) {
std::vector<const transaction::Variable *> *l = new std::vector<const transaction::Variable *>();
std::vector<const transaction::Variable *> *l = NULL;
l = new std::vector<const transaction::Variable *>();
evaluate(assay, l);
return l;
}
void Variable::evaluateInternal(Assay *assay, std::vector<const transaction::Variable *> *l) {
void Variable::evaluateInternal(Assay *assay,
std::vector<const transaction::Variable *> *l) {
if (m_collectionName.empty() == false) {
if (m_kind == CollectionVarible && m_type == MultipleMatches) {
assay->m_collections.resolveMultiMatches(m_name, m_collectionName, l);
} if (m_kind == CollectionVarible && m_type == RegularExpression) {
assay->m_collections.resolveRegularExpression(m_name, m_collectionName, l);
assay->m_collections.resolveMultiMatches(m_name,
m_collectionName, l);
} else if (m_kind == CollectionVarible
&& m_type == RegularExpression) {
assay->m_collections.resolveRegularExpression(m_name,
m_collectionName, l);
} else {
assay->m_collections.resolveSingleMatch(m_name, m_collectionName, l);
assay->m_collections.resolveSingleMatch(m_name,
m_collectionName, l);
}
} else {
if (m_kind == CollectionVarible && m_type == MultipleMatches) {
assay->m_collections.resolveMultiMatches(m_name, l);
} if (m_kind == CollectionVarible && m_type == RegularExpression) {
} else if (m_kind == CollectionVarible
&& m_type == RegularExpression) {
assay->m_collections.resolveRegularExpression(m_name, l);
} else {
assay->m_collections.resolveSingleMatch(m_name, l);
@@ -102,7 +107,8 @@ void Variable::evaluateInternal(Assay *assay, std::vector<const transaction::Var
}
void Variable::evaluate(Assay *assay, std::vector<const transaction::Variable *> *l) {
void Variable::evaluate(Assay *assay,
std::vector<const transaction::Variable *> *l) {
evaluateInternal(assay, l);
}

6
src/variables/variable.h
View File

@@ -67,8 +67,10 @@ class Variable {
static std::string to_s(std::vector<Variable *> *variables);
virtual std::vector<const transaction::Variable *> *evaluate(Assay *assay);
virtual void evaluate(Assay *assay, std::vector<const transaction::Variable *> *l);
virtual void evaluateInternal(Assay *assay, std::vector<const transaction::Variable *> *l);
virtual void evaluate(Assay *assay,
std::vector<const transaction::Variable *> *l);
virtual void evaluateInternal(Assay *assay,
std::vector<const transaction::Variable *> *l);
std::string m_name;