Treating ARGS_NAMES as an array instead of scalar

Both value and key are the same.
This commit is contained in:
Felipe Zimmerle
2017-08-22 18:26:56 -03:00
parent 81879cd131
commit 1d3c4c670d
10 changed files with 3269 additions and 3197 deletions

View File

@@ -29,18 +29,51 @@ namespace modsecurity {
class Transaction;
namespace Variables {
class ArgsNames : public Variable {
class ArgsNames_DictElement : public Variable {
public:
ArgsNames()
explicit ArgsNames_DictElement(std::string dictElement)
: Variable("ARGS_NAMES" + std::string(":") + std::string(dictElement)),
m_dictElement(dictElement) { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
transaction->m_variableArgsNames.resolve(m_dictElement, l);
}
std::string m_dictElement;
};
class ArgsNames_NoDictElement : public Variable {
public:
ArgsNames_NoDictElement()
: Variable("ARGS_NAMES") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
transaction->m_variableArgsNames.evaluate(l);
std::vector<const collection::Variable *> *l) override {
transaction->m_variableArgsNames.resolve(l);
}
};
class ArgsNames_DictElementRegexp : public Variable {
public:
explicit ArgsNames_DictElementRegexp(std::string dictElement)
: Variable("ARGS_NAMES:regex(" + dictElement + ")"),
m_r(dictElement) {
}
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
transaction->m_variableArgsNames.resolveRegularExpression(&m_r, l);
}
Utils::Regex m_r;
};
} // namespace Variables
} // namespace modsecurity