Revert "Treating ARGS_NAMES as an array instead of scalar"

This reverts commit 1d3c4c670d.
This commit is contained in:
Felipe Zimmerle
2017-08-23 23:55:02 -03:00
parent 43e3ff91e8
commit 9069a453e5
18 changed files with 3731 additions and 3068 deletions

View File

@@ -29,18 +29,50 @@ namespace modsecurity {
class Transaction;
namespace Variables {
class ArgsPostNames : public Variable {
class ArgsPostNames_DictElement : public Variable {
public:
ArgsPostNames()
explicit ArgsPostNames_DictElement(std::string dictElement)
: Variable("ARGS_POST_NAMES" + std::string(":") +
std::string(dictElement)),
m_dictElement(dictElement) { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
transaction->m_variableArgsPostNames.resolve(m_dictElement, l);
}
std::string m_dictElement;
};
class ArgsPostNames_NoDictElement : public Variable {
public:
ArgsPostNames_NoDictElement()
: Variable("ARGS_POST_NAMES") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
transaction->m_variableArgPostNames.evaluate(l);
std::vector<const collection::Variable *> *l) override {
transaction->m_variableArgsPostNames.resolve(l);
}
};
class ArgsPostNames_DictElementRegexp : public Variable {
public:
explicit ArgsPostNames_DictElementRegexp(std::string dictElement)
: Variable("ARGS_POST_NAMES"),
m_r(dictElement) { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
transaction->m_variableArgsPostNames.resolveRegularExpression(
&m_r, l);
}
Utils::Regex m_r;
};
} // namespace Variables
} // namespace modsecurity