From de79848285020c5047d02a0e734efdf157d9c3f2 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Wed, 18 Nov 2015 12:59:08 -0300 Subject: [PATCH] Code cosmetics --- headers/modsecurity/transaction/collection.h | 4 ++- headers/modsecurity/transaction/variables.h | 1 - .../transformations/html_entity_decode.h | 5 ++-- src/actions/transformations/lower_case.h | 5 ++-- src/actions/transformations/url_decode.h | 5 ++-- src/collections.cc | 12 +++------ src/operators/detect_sqli.h | 1 + src/rule.cc | 1 - src/variables.cc | 3 +-- src/variables/variable.cc | 26 ++++++++++++------- src/variables/variable.h | 6 +++-- 11 files changed, 37 insertions(+), 32 deletions(-) diff --git a/headers/modsecurity/transaction/collection.h b/headers/modsecurity/transaction/collection.h index 069f1940..51e54d88 100644 --- a/headers/modsecurity/transaction/collection.h +++ b/headers/modsecurity/transaction/collection.h @@ -24,13 +24,15 @@ typedef struct Collection_t Collection; #ifdef __cplusplus +#include + namespace ModSecurity { class Collection : public transaction::Variables { public: Collection(std::string name, std::string key) : m_name(name), - m_key(key) { }; + m_key(key) { } std::string m_name; clock_t m_createTime; diff --git a/headers/modsecurity/transaction/variables.h b/headers/modsecurity/transaction/variables.h index cdb0214d..3e9f4ee9 100644 --- a/headers/modsecurity/transaction/variables.h +++ b/headers/modsecurity/transaction/variables.h @@ -61,7 +61,6 @@ class Variables : std::vector *l); void resolveRegularExpression(const std::string& var, std::vector *l); - }; } // namespace transaction diff --git a/src/actions/transformations/html_entity_decode.h b/src/actions/transformations/html_entity_decode.h index 1dcdda32..7deb20d9 100644 --- a/src/actions/transformations/html_entity_decode.h +++ b/src/actions/transformations/html_entity_decode.h @@ -30,7 +30,8 @@ namespace actions { namespace transformations { -class HtmlEntityDecodeInstantCache : public std::unordered_map { +class HtmlEntityDecodeInstantCache : + public std::unordered_map { public: static HtmlEntityDecodeInstantCache& getInstance() { static HtmlEntityDecodeInstantCache instance; @@ -44,7 +45,7 @@ class HtmlEntityDecodeInstantCache : public std::unordered_map { +class LowerCaseInstantCache : + public std::unordered_map { public: static LowerCaseInstantCache& getInstance() { static LowerCaseInstantCache instance; @@ -43,7 +44,7 @@ class LowerCaseInstantCache : public std::unordered_map { +class UrlDecodeInstantCache : + public std::unordered_map { public: static UrlDecodeInstantCache& getInstance() { static UrlDecodeInstantCache instance; @@ -43,7 +44,7 @@ class UrlDecodeInstantCache : public std::unordered_mapat(collection)->resolveSingleMatch(var, l); - } catch (...) { - - } + } catch (...) { } } void Collections::resolveMultiMatches(const std::string& var, @@ -149,9 +147,7 @@ void Collections::resolveMultiMatches(const std::string& var, std::vector *l) { try { this->at(collection)->resolveMultiMatches(var, l); - } catch (...) { - - } + } catch (...) { } } void Collections::resolveRegularExpression(const std::string& var, @@ -166,9 +162,7 @@ void Collections::resolveRegularExpression(const std::string& var, try { this->at(collection)->resolveRegularExpression(var, l); - } catch (...) { - - } + } catch (...) { } } } // namespace transaction diff --git a/src/operators/detect_sqli.h b/src/operators/detect_sqli.h index 26c33fd2..c21d3569 100644 --- a/src/operators/detect_sqli.h +++ b/src/operators/detect_sqli.h @@ -17,6 +17,7 @@ #define SRC_OPERATORS_DETECT_SQLI_H_ #include +#include #include "operators/operator.h" diff --git a/src/rule.cc b/src/rule.cc index f8cb476c..1b0da68f 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -488,7 +488,6 @@ bool Rule::evaluate(Assay *assay) { delete e.back(); e.pop_back(); } - //delete e; } return ret; } diff --git a/src/variables.cc b/src/variables.cc index cbfb7213..c48e7916 100644 --- a/src/variables.cc +++ b/src/variables.cc @@ -96,8 +96,7 @@ void Variables::resolveMultiMatches(const std::string& var, if (x.first.compare(0, keySize, var) != 0) { continue; } - const transaction::Variable *v = new transaction::Variable(x.first, x.second); - l->insert(l->begin(), v); + l->insert(l->begin(), new transaction::Variable(x.first, x.second)); } } diff --git a/src/variables/variable.cc b/src/variables/variable.cc index bac67d6e..92400a08 100644 --- a/src/variables/variable.cc +++ b/src/variables/variable.cc @@ -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 * Variable::evaluate(Assay *assay) { - std::vector *l = new std::vector(); + std::vector *l = NULL; + l = new std::vector(); evaluate(assay, l); return l; } -void Variable::evaluateInternal(Assay *assay, std::vector *l) { +void Variable::evaluateInternal(Assay *assay, + std::vector *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 *l) { +void Variable::evaluate(Assay *assay, + std::vector *l) { evaluateInternal(assay, l); } diff --git a/src/variables/variable.h b/src/variables/variable.h index 50dd597e..5089f369 100644 --- a/src/variables/variable.h +++ b/src/variables/variable.h @@ -67,8 +67,10 @@ class Variable { static std::string to_s(std::vector *variables); virtual std::vector *evaluate(Assay *assay); - virtual void evaluate(Assay *assay, std::vector *l); - virtual void evaluateInternal(Assay *assay, std::vector *l); + virtual void evaluate(Assay *assay, + std::vector *l); + virtual void evaluateInternal(Assay *assay, + std::vector *l); std::string m_name;