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

Renames namespace Variables to variables

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-03-06 15:53:20 -03:00
parent b9ed150224
commit 4e76c6adf0
138 changed files with 636 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headers/modsecurity/anchored_set_variable.h
View File

@@ -41,7 +41,7 @@ class Transaction;
namespace Utils {
class Regex;
}
namespace Variables {
namespace variables {
class KeyExclusions;
}
@@ -86,7 +86,7 @@ class AnchoredSetVariable : public std::unordered_multimap<std::string,
void resolve(std::vector<const VariableValue *> *l);
void resolve(std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke);
variables::KeyExclusions &ke);
void resolve(const std::string &key,
std::vector<const VariableValue *> *l);
@@ -96,7 +96,7 @@ class AnchoredSetVariable : public std::unordered_multimap<std::string,
void resolveRegularExpression(Utils::Regex *r,
std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke);
variables::KeyExclusions &ke);
std::unique_ptr<std::string> resolveFirst(const std::string &key);

14
headers/modsecurity/collection/collection.h
View File

@@ -37,7 +37,7 @@ typedef struct Variable_t Variables;
#ifdef __cplusplus
namespace modsecurity {
namespace Variables {
namespace variables {
class KeyExclusions;
}
namespace collection {
@@ -63,10 +63,10 @@ class Collection {
std::vector<const VariableValue *> *l) = 0;
virtual void resolveMultiMatches(const std::string& var,
std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke) = 0;
variables::KeyExclusions &ke) = 0;
virtual void resolveRegularExpression(const std::string& var,
std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke) = 0;
variables::KeyExclusions &ke) = 0;
/* store */
@@ -163,7 +163,7 @@ class Collection {
/* resolveMultiMatches */
virtual void resolveMultiMatches(const std::string& var,
std::string compartment, std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke) {
variables::KeyExclusions &ke) {
std::string nkey = compartment + "::" + var;
resolveMultiMatches(nkey, l, ke);
}
@@ -172,7 +172,7 @@ class Collection {
virtual void resolveMultiMatches(const std::string& var,
std::string compartment, std::string compartment2,
std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke) {
variables::KeyExclusions &ke) {
std::string nkey = compartment + "::" + compartment2 + "::" + var;
resolveMultiMatches(nkey, l, ke);
}
@@ -181,7 +181,7 @@ class Collection {
/* resolveRegularExpression */
virtual void resolveRegularExpression(const std::string& var,
std::string compartment, std::vector<const VariableValue *> *l,
Variables::KeyExclusions &ke) {
variables::KeyExclusions &ke) {
std::string nkey = compartment + "::" + var;
resolveRegularExpression(nkey, l, ke);
}
@@ -189,7 +189,7 @@ class Collection {
virtual void resolveRegularExpression(const std::string& var,
std::string compartment, std::string compartment2,
std::vector<const VariableValue *> *l, Variables::KeyExclusions &ke) {
std::vector<const VariableValue *> *l, variables::KeyExclusions &ke) {
std::string nkey = compartment + "::" + compartment2 + "::" + var;
resolveRegularExpression(nkey, l, ke);
}

12
headers/modsecurity/rule.h
View File

@@ -32,7 +32,7 @@
#ifdef __cplusplus
namespace modsecurity {
namespace Variables {
namespace variables {
class Variable;
class Variables;
}
@@ -52,7 +52,7 @@ class Operator;
class Rule {
public:
Rule(operators::Operator *_op,
Variables::Variables *_variables,
variables::Variables *_variables,
std::vector<actions::Action *> *_actions,
std::string fileName,
int lineNumber);
@@ -77,9 +77,9 @@ class Rule {
int *nth);
void getVariablesExceptions(Transaction *t,
Variables::Variables *exclusion, Variables::Variables *addition);
inline void getFinalVars(Variables::Variables *vars,
Variables::Variables *eclusion, Transaction *trans);
variables::Variables *exclusion, variables::Variables *addition);
inline void getFinalVars(variables::Variables *vars,
variables::Variables *eclusion, Transaction *trans);
void executeActionsAfterFullMatch(Transaction *trasn,
bool containsDisruptive, std::shared_ptr<RuleMessage> ruleMessage);
@@ -138,7 +138,7 @@ class Rule {
int m_lineNumber;
int m_maturity;
int m_phase;
modsecurity::Variables::Variables *m_variables;
modsecurity::variables::Variables *m_variables;
operators::Operator *m_op;
Rule *m_chainedRuleChild;
Rule *m_chainedRuleParent;

14
headers/modsecurity/rules_exceptions.h
View File

@@ -38,7 +38,7 @@ namespace modsecurity {
namespace actions {
class Action;
}
namespace Variables {
namespace variables {
class Variable;
}
@@ -57,15 +57,15 @@ class RulesExceptions {
bool loadRemoveRuleByTag(const std::string &msg, std::string *error);
bool loadUpdateTargetByMsg(const std::string &msg,
std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
std::string *error);
bool loadUpdateTargetByTag(const std::string &tag,
std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
std::string *error);
bool loadUpdateTargetById(double id,
std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
std::string *error);
bool loadUpdateActionById(double id,
@@ -73,11 +73,11 @@ class RulesExceptions {
std::string *error);
std::unordered_multimap<std::shared_ptr<std::string>,
std::shared_ptr<Variables::Variable>> m_variable_update_target_by_tag;
std::shared_ptr<variables::Variable>> m_variable_update_target_by_tag;
std::unordered_multimap<std::shared_ptr<std::string>,
std::shared_ptr<Variables::Variable>> m_variable_update_target_by_msg;
std::shared_ptr<variables::Variable>> m_variable_update_target_by_msg;
std::unordered_multimap<double,
std::shared_ptr<Variables::Variable>> m_variable_update_target_by_id;
std::shared_ptr<variables::Variable>> m_variable_update_target_by_id;
std::unordered_multimap<double,
std::shared_ptr<actions::Action>> m_action_pre_update_target_by_id;
std::unordered_multimap<double,