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 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

6
src/variables/duration.cc
View File

@@ -21,17 +21,17 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#include "src/utils.h"
namespace modsecurity {
namespace Variables {
void Duration::evaluateInternal(Assay *assay,
void Duration::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
std::string res;
double e = cpu_seconds() - assay->start;
double e = cpu_seconds() - transaction->start;
res = std::to_string(e);

4
src/variables/duration.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class Duration : public Variable {
@@ -33,7 +33,7 @@ class Duration : public Variable {
explicit Duration(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/env.cc
View File

@@ -25,7 +25,7 @@
#include <utility>
#include <map>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#include "src/utils.h"
extern char **environ;
@@ -33,7 +33,7 @@ extern char **environ;
namespace modsecurity {
namespace Variables {
void Env::evaluateInternal(Assay *assay,
void Env::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
std::map<std::string, std::string> envs;
for (char **current = environ; *current; current++) {

4
src/variables/env.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class Env : public Variable {
@@ -33,7 +33,7 @@ class Env : public Variable {
explicit Env(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

6
src/variables/highest_severity.cc
View File

@@ -21,15 +21,15 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void HighestSeverity::evaluateInternal(Assay *assay,
void HighestSeverity::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
l->push_back(new transaction::Variable("HIGHEST_SEVERITY",
std::to_string(assay->highest_severity)));
std::to_string(transaction->highest_severity)));
}

4
src/variables/highest_severity.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class HighestSeverity : public Variable {
@@ -33,7 +33,7 @@ class HighestSeverity : public Variable {
explicit HighestSeverity(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/modsec_build.cc
View File

@@ -21,13 +21,13 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#include "modsecurity/modsecurity.h"
namespace modsecurity {
namespace Variables {
void ModsecBuild::evaluateInternal(Assay *assay,
void ModsecBuild::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
std::ostringstream ss;
ss << std::setw(2) << std::setfill('0') << MODSECURITY_MAJOR;

4
src/variables/modsec_build.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class ModsecBuild : public Variable {
@@ -33,7 +33,7 @@ class ModsecBuild : public Variable {
explicit ModsecBuild(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void Time::evaluateInternal(Assay *assay,
void Time::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];

4
src/variables/time.h
View File

@@ -26,7 +26,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class Time : public Variable {
@@ -34,7 +34,7 @@ class Time : public Variable {
explicit Time(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_day.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeDay::evaluateInternal(Assay *assay,
void TimeDay::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_day.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeDay : public Variable {
@@ -33,7 +33,7 @@ class TimeDay : public Variable {
explicit TimeDay(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_epoch.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeEpoch::evaluateInternal(Assay *assay,
void TimeEpoch::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
l->push_back(new transaction::Variable("TIME_EPOCH",
std::to_string(std::time(nullptr))));

4
src/variables/time_epoch.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeEpoch : public Variable {
@@ -33,7 +33,7 @@ class TimeEpoch : public Variable {
explicit TimeEpoch(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_hour.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeHour::evaluateInternal(Assay *assay,
void TimeHour::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_hour.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeHour : public Variable {
@@ -33,7 +33,7 @@ class TimeHour : public Variable {
explicit TimeHour(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_min.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeMin::evaluateInternal(Assay *assay,
void TimeMin::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_min.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeMin : public Variable {
@@ -33,7 +33,7 @@ class TimeMin : public Variable {
explicit TimeMin(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_mon.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeMon::evaluateInternal(Assay *assay,
void TimeMon::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_mon.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeMon : public Variable {
@@ -33,7 +33,7 @@ class TimeMon : public Variable {
explicit TimeMon(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_sec.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeSec::evaluateInternal(Assay *assay,
void TimeSec::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_sec.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeSec : public Variable {
@@ -33,7 +33,7 @@ class TimeSec : public Variable {
explicit TimeSec(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_wday.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeWDay::evaluateInternal(Assay *assay,
void TimeWDay::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_wday.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeWDay : public Variable {
@@ -33,7 +33,7 @@ class TimeWDay : public Variable {
explicit TimeWDay(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

4
src/variables/time_year.cc
View File

@@ -28,12 +28,12 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void TimeYear::evaluateInternal(Assay *assay,
void TimeYear::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
char tstr[200];
struct tm timeinfo;

4
src/variables/time_year.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class TimeYear : public Variable {
@@ -33,7 +33,7 @@ class TimeYear : public Variable {
explicit TimeYear(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

10
src/variables/tx.cc
View File

@@ -28,20 +28,20 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
namespace modsecurity {
namespace Variables {
void Tx::evaluateInternal(Assay *assay,
void Tx::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
if (m_type == SingleMatch) {
assay->m_collections.resolveSingleMatch(m_name, "TX", l);
transaction->m_collections.resolveSingleMatch(m_name, "TX", l);
} else if (m_type == MultipleMatches) {
assay->m_collections.resolveMultiMatches(m_name, "TX", l);
transaction->m_collections.resolveMultiMatches(m_name, "TX", l);
} else if (m_type == RegularExpression) {
assay->m_collections.resolveRegularExpression(m_name, "TX", l);
transaction->m_collections.resolveRegularExpression(m_name, "TX", l);
}
}

4
src/variables/tx.h
View File

@@ -26,7 +26,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class Tx : public Variable {
@@ -34,7 +34,7 @@ class Tx : public Variable {
explicit Tx(std::string _name)
: Variable(_name) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
};

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);
}

13
src/variables/variable.h
View File

@@ -17,14 +17,14 @@
#include <string>
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#ifndef SRC_VARIABLES_VARIABLE_H_
#define SRC_VARIABLES_VARIABLE_H_
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
class Variable {
@@ -66,10 +66,13 @@ 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,
virtual std::vector<const transaction::Variable *>
*evaluate(Transaction *transaction);
virtual void evaluate(Transaction *transaction,
std::vector<const transaction::Variable *> *l);
virtual void evaluateInternal(Assay *assay,
virtual void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l);

6
src/variables/variations/count.cc
View File

@@ -21,19 +21,19 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#include "src/utils.h"
namespace modsecurity {
namespace Variables {
namespace Variations {
void Count::evaluateInternal(Assay *assay,
void Count::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
std::vector<const transaction::Variable *> *reslIn;
int count = 0;
reslIn = var->evaluate(assay);
reslIn = var->evaluate(transaction);
for (auto &a : *reslIn) {
count++;

4
src/variables/variations/count.h
View File

@@ -25,7 +25,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
namespace Variations {
@@ -35,7 +35,7 @@ class Count : public Variable {
: Variable("count(" + v->m_name + ")"),
var(v) { }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
Variable *var;

6
src/variables/variations/exclusion.cc
View File

@@ -21,7 +21,7 @@
#include <list>
#include <utility>
#include "modsecurity/assay.h"
#include "modsecurity/transaction.h"
#include "src/utils.h"
namespace modsecurity {
@@ -29,9 +29,9 @@ namespace Variables {
namespace Variations {
void Exclusion::evaluateInternal(Assay *assay,
void Exclusion::evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) {
assay->m_collections.resolveMultiMatches(m_name, l);
transaction->m_collections.resolveMultiMatches(m_name, l);
}

4
src/variables/variations/exclusion.h
View File

@@ -26,7 +26,7 @@
namespace modsecurity {
class Assay;
class Transaction;
namespace Variables {
namespace Variations {
@@ -37,7 +37,7 @@ class Exclusion : public Variable {
var(v)
{ m_isExclusion = true; }
void evaluateInternal(Assay *assay,
void evaluateInternal(Transaction *transaction,
std::vector<const transaction::Variable *> *l) override;
Variable *var;