Skip to content

Commit 4e76c6a

Browse files
zimmerlezimmerle
committed
Renames namespace Variables to variables
1 parent b9ed150 commit 4e76c6a

File tree

138 files changed

+636
-636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+636
-636
lines changed

‎headers/modsecurity/anchored_set_variable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Transaction;
4141
namespace Utils {
4242
class Regex;
4343
}
44-
namespace Variables {
44+
namespace variables {
4545
class KeyExclusions;
4646
}
4747

@@ -86,7 +86,7 @@ class AnchoredSetVariable : public std::unordered_multimap<std::string,
8686

8787
void resolve(std::vector<const VariableValue *> *l);
8888
void resolve(std::vector<const VariableValue *> *l,
89-
Variables::KeyExclusions &ke);
89+
variables::KeyExclusions &ke);
9090

9191
void resolve(const std::string &key,
9292
std::vector<const VariableValue *> *l);
@@ -96,7 +96,7 @@ class AnchoredSetVariable : public std::unordered_multimap<std::string,
9696

9797
void resolveRegularExpression(Utils::Regex *r,
9898
std::vector<const VariableValue *> *l,
99-
Variables::KeyExclusions &ke);
99+
variables::KeyExclusions &ke);
100100

101101
std::unique_ptr<std::string> resolveFirst(const std::string &key);
102102

‎headers/modsecurity/collection/collection.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef struct Variable_t Variables;
3737

3838
#ifdef __cplusplus
3939
namespace modsecurity {
40-
namespace Variables {
40+
namespace variables {
4141
class KeyExclusions;
4242
}
4343
namespace collection {
@@ -63,10 +63,10 @@ class Collection {
6363
std::vector<const VariableValue *> *l) = 0;
6464
virtual void resolveMultiMatches(const std::string& var,
6565
std::vector<const VariableValue *> *l,
66-
Variables::KeyExclusions &ke) = 0;
66+
variables::KeyExclusions &ke) = 0;
6767
virtual void resolveRegularExpression(const std::string& var,
6868
std::vector<const VariableValue *> *l,
69-
Variables::KeyExclusions &ke) = 0;
69+
variables::KeyExclusions &ke) = 0;
7070

7171

7272
/* store */
@@ -163,7 +163,7 @@ class Collection {
163163
/* resolveMultiMatches */
164164
virtual void resolveMultiMatches(const std::string& var,
165165
std::string compartment, std::vector<const VariableValue *> *l,
166-
Variables::KeyExclusions &ke) {
166+
variables::KeyExclusions &ke) {
167167
std::string nkey = compartment + "::" + var;
168168
resolveMultiMatches(nkey, l, ke);
169169
}
@@ -172,7 +172,7 @@ class Collection {
172172
virtual void resolveMultiMatches(const std::string& var,
173173
std::string compartment, std::string compartment2,
174174
std::vector<const VariableValue *> *l,
175-
Variables::KeyExclusions &ke) {
175+
variables::KeyExclusions &ke) {
176176
std::string nkey = compartment + "::" + compartment2 + "::" + var;
177177
resolveMultiMatches(nkey, l, ke);
178178
}
@@ -181,15 +181,15 @@ class Collection {
181181
/* resolveRegularExpression */
182182
virtual void resolveRegularExpression(const std::string& var,
183183
std::string compartment, std::vector<const VariableValue *> *l,
184-
Variables::KeyExclusions &ke) {
184+
variables::KeyExclusions &ke) {
185185
std::string nkey = compartment + "::" + var;
186186
resolveRegularExpression(nkey, l, ke);
187187
}
188188

189189

190190
virtual void resolveRegularExpression(const std::string& var,
191191
std::string compartment, std::string compartment2,
192-
std::vector<const VariableValue *> *l, Variables::KeyExclusions &ke) {
192+
std::vector<const VariableValue *> *l, variables::KeyExclusions &ke) {
193193
std::string nkey = compartment + "::" + compartment2 + "::" + var;
194194
resolveRegularExpression(nkey, l, ke);
195195
}

‎headers/modsecurity/rule.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#ifdef __cplusplus
3333

3434
namespace modsecurity {
35-
namespace Variables {
35+
namespace variables {
3636
class Variable;
3737
class Variables;
3838
}
@@ -52,7 +52,7 @@ class Operator;
5252
class Rule {
5353
public:
5454
Rule(operators::Operator *_op,
55-
Variables::Variables *_variables,
55+
variables::Variables *_variables,
5656
std::vector<actions::Action *> *_actions,
5757
std::string fileName,
5858
int lineNumber);
@@ -77,9 +77,9 @@ class Rule {
7777
int *nth);
7878

7979
void getVariablesExceptions(Transaction *t,
80-
Variables::Variables *exclusion, Variables::Variables *addition);
81-
inline void getFinalVars(Variables::Variables *vars,
82-
Variables::Variables *eclusion, Transaction *trans);
80+
variables::Variables *exclusion, variables::Variables *addition);
81+
inline void getFinalVars(variables::Variables *vars,
82+
variables::Variables *eclusion, Transaction *trans);
8383
void executeActionsAfterFullMatch(Transaction *trasn,
8484
bool containsDisruptive, std::shared_ptr<RuleMessage> ruleMessage);
8585

@@ -138,7 +138,7 @@ class Rule {
138138
int m_lineNumber;
139139
int m_maturity;
140140
int m_phase;
141-
modsecurity::Variables::Variables *m_variables;
141+
modsecurity::variables::Variables *m_variables;
142142
operators::Operator *m_op;
143143
Rule *m_chainedRuleChild;
144144
Rule *m_chainedRuleParent;

‎headers/modsecurity/rules_exceptions.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace modsecurity {
3838
namespace actions {
3939
class Action;
4040
}
41-
namespace Variables {
41+
namespace variables {
4242
class Variable;
4343
}
4444

@@ -57,27 +57,27 @@ class RulesExceptions {
5757
bool loadRemoveRuleByTag(const std::string &msg, std::string *error);
5858

5959
bool loadUpdateTargetByMsg(const std::string &msg,
60-
std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
60+
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
6161
std::string *error);
6262

6363
bool loadUpdateTargetByTag(const std::string &tag,
64-
std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
64+
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
6565
std::string *error);
6666

6767
bool loadUpdateTargetById(double id,
68-
std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
68+
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
6969
std::string *error);
7070

7171
bool loadUpdateActionById(double id,
7272
std::unique_ptr<std::vector<std::unique_ptr<actions::Action> > > actions,
7373
std::string *error);
7474

7575
std::unordered_multimap<std::shared_ptr<std::string>,
76-
std::shared_ptr<Variables::Variable>> m_variable_update_target_by_tag;
76+
std::shared_ptr<variables::Variable>> m_variable_update_target_by_tag;
7777
std::unordered_multimap<std::shared_ptr<std::string>,
78-
std::shared_ptr<Variables::Variable>> m_variable_update_target_by_msg;
78+
std::shared_ptr<variables::Variable>> m_variable_update_target_by_msg;
7979
std::unordered_multimap<double,
80-
std::shared_ptr<Variables::Variable>> m_variable_update_target_by_id;
80+
std::shared_ptr<variables::Variable>> m_variable_update_target_by_id;
8181
std::unordered_multimap<double,
8282
std::shared_ptr<actions::Action>> m_action_pre_update_target_by_id;
8383
std::unordered_multimap<double,

‎src/actions/set_var.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ bool SetVar::evaluate(Rule *rule, Transaction *t) {
5252
std::vector<const VariableValue *> l;
5353

5454
auto *v = m_variable.get();
55-
Variables::Tx_DynamicElement *tx = dynamic_cast<
56-
Variables::Tx_DynamicElement *> (v);
57-
Variables::Session_DynamicElement *session = dynamic_cast<
58-
Variables::Session_DynamicElement *> (v);
59-
Variables::Ip_DynamicElement *ip = dynamic_cast<
60-
Variables::Ip_DynamicElement *> (v);
61-
Variables::Resource_DynamicElement *resource = dynamic_cast<
62-
Variables::Resource_DynamicElement *> (v);
63-
Variables::Global_DynamicElement *global = dynamic_cast<
64-
Variables::Global_DynamicElement *> (v);
65-
Variables::User_DynamicElement *user = dynamic_cast<
66-
Variables::User_DynamicElement *> (v);
55+
variables::Tx_DynamicElement *tx = dynamic_cast<
56+
variables::Tx_DynamicElement *> (v);
57+
variables::Session_DynamicElement *session = dynamic_cast<
58+
variables::Session_DynamicElement *> (v);
59+
variables::Ip_DynamicElement *ip = dynamic_cast<
60+
variables::Ip_DynamicElement *> (v);
61+
variables::Resource_DynamicElement *resource = dynamic_cast<
62+
variables::Resource_DynamicElement *> (v);
63+
variables::Global_DynamicElement *global = dynamic_cast<
64+
variables::Global_DynamicElement *> (v);
65+
variables::User_DynamicElement *user = dynamic_cast<
66+
variables::User_DynamicElement *> (v);
6767
if (tx) {
6868
m_variableNameExpanded = tx->m_string->evaluate(t, rule);
6969
} else if (session) {

‎src/actions/set_var.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ enum SetVarOperation {
4545
class SetVar : public Action {
4646
public:
4747
SetVar(SetVarOperation operation,
48-
std::unique_ptr<modsecurity::Variables::Variable> variable,
48+
std::unique_ptr<modsecurity::variables::Variable> variable,
4949
std::unique_ptr<RunTimeString> predicate)
5050
: Action("setvar"),
5151
m_operation(operation),
5252
m_variable(std::move(variable)),
5353
m_string(std::move(predicate)) { }
5454

5555
SetVar(SetVarOperation operation,
56-
std::unique_ptr<modsecurity::Variables::Variable> variable)
56+
std::unique_ptr<modsecurity::variables::Variable> variable)
5757
: Action("setvar"),
5858
m_operation(operation),
5959
m_variable(std::move(variable)) { }
@@ -63,7 +63,7 @@ class SetVar : public Action {
6363

6464
private:
6565
SetVarOperation m_operation;
66-
std::unique_ptr<modsecurity::Variables::Variable> m_variable;
66+
std::unique_ptr<modsecurity::variables::Variable> m_variable;
6767
std::unique_ptr<RunTimeString> m_string;
6868
};
6969

‎src/anchored_set_variable.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void AnchoredSetVariable::resolve(
9191

9292
void AnchoredSetVariable::resolve(
9393
std::vector<const VariableValue *> *l,
94-
Variables::KeyExclusions &ke) {
94+
variables::KeyExclusions &ke) {
9595
for (const auto& x : *this) {
9696
if (!ke.toOmit(x.first)) {
9797
l->insert(l->begin(), new VariableValue(x.second));
@@ -138,7 +138,7 @@ void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
138138

139139
void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r,
140140
std::vector<const VariableValue *> *l,
141-
Variables::KeyExclusions &ke) {
141+
variables::KeyExclusions &ke) {
142142
for (const auto& x : *this) {
143143
int ret = Utils::regex_search(x.first, *r);
144144
if (ret <= 0) {

‎src/collection/backend/in_memory-per_process.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void InMemoryPerProcess::resolveSingleMatch(const std::string& var,
9696

9797

9898
void InMemoryPerProcess::resolveMultiMatches(const std::string& var,
99-
std::vector<const VariableValue *> *l, Variables::KeyExclusions &ke) {
99+
std::vector<const VariableValue *> *l, variables::KeyExclusions &ke) {
100100
size_t keySize = var.size();
101101
l->reserve(15);
102102

@@ -122,7 +122,7 @@ void InMemoryPerProcess::resolveMultiMatches(const std::string& var,
122122

123123

124124
void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
125-
std::vector<const VariableValue *> *l, Variables::KeyExclusions &ke) {
125+
std::vector<const VariableValue *> *l, variables::KeyExclusions &ke) {
126126

127127
//if (var.find(":") == std::string::npos) {
128128
// return;

‎src/collection/backend/in_memory-per_process.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ class InMemoryPerProcess :
9090
std::vector<const VariableValue *> *l) override;
9191
void resolveMultiMatches(const std::string& var,
9292
std::vector<const VariableValue *> *l,
93-
Variables::KeyExclusions &ke) override;
93+
variables::KeyExclusions &ke) override;
9494
void resolveRegularExpression(const std::string& var,
9595
std::vector<const VariableValue *> *l,
96-
Variables::KeyExclusions &ke) override;
96+
variables::KeyExclusions &ke) override;
9797

9898
private:
9999
pthread_mutex_t m_lock;

‎src/collection/backend/lmdb.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ void LMDB::del(const std::string& key) {
467467

468468
void LMDB::resolveMultiMatches(const std::string& var,
469469
std::vector<const VariableValue *> *l,
470-
Variables::KeyExclusions &ke) {
470+
variables::KeyExclusions &ke) {
471471
MDB_val key, data;
472472
MDB_txn *txn = NULL;
473473
MDB_dbi dbi;
@@ -529,7 +529,7 @@ void LMDB::resolveMultiMatches(const std::string& var,
529529

530530
void LMDB::resolveRegularExpression(const std::string& var,
531531
std::vector<const VariableValue *> *l,
532-
Variables::KeyExclusions &ke) {
532+
variables::KeyExclusions &ke) {
533533
MDB_val key, data;
534534
MDB_txn *txn = NULL;
535535
MDB_dbi dbi;

0 commit comments

Comments
 (0)