github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adds method init to Operator class

Browse Source
This commit is contained in:
Felipe Zimmerle 2015-07-27 22:43:45 -03:00
parent 7b4554216e
commit c2d33823f5
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/operators/operator.h
View File

@ -35,11 +35,12 @@ class Operator {
param(param), param(param),
negation(negation) { } negation(negation) { }
virtual ~Operator() { }
std::string op; std::string op;
std::string param; std::string param;
bool negation; bool negation;
virtual bool init(const char **error) { return true; }
virtual bool evaluate(Assay *assay); virtual bool evaluate(Assay *assay);
virtual bool evaluate(Assay *assay, const std::string &str); virtual bool evaluate(Assay *assay, const std::string &str);
static Operator *instantiate(std::string op); static Operator *instantiate(std::string op);

8
src/parser/seclang-parser.yy
View File

@ -261,8 +261,14 @@ expression:
audit_log audit_log
| DIRECTIVE SPACE variables SPACE OPERATOR SPACE QUOTATION_MARK actions QUOTATION_MARK | DIRECTIVE SPACE variables SPACE OPERATOR SPACE QUOTATION_MARK actions QUOTATION_MARK
{ {
Operator *op = Operator::instantiate($5);
const char *error = NULL;
if (op->init(&error) == false) {
driver.parserError << error;
YYERROR;
}
Rule *rule = new Rule( Rule *rule = new Rule(
/* op */ Operator::instantiate($5), /* op */ op,
/* variables */ $3, /* variables */ $3,
/* actions */ $8 /* actions */ $8
); );

2
test/unit/unit.cc
View File

@ -54,9 +54,11 @@ void print_help() {
void perform_unit_test(UnitTest *t, ModSecurityTestResults<UnitTest>* res) { void perform_unit_test(UnitTest *t, ModSecurityTestResults<UnitTest>* res) {
const char *error = NULL;
ModSecurity::operators::Operator *op = ModSecurity::operators::Operator *op =
ModSecurity::operators::Operator::instantiate("\"@" + t->name + \ ModSecurity::operators::Operator::instantiate("\"@" + t->name + \
" " + t->param + "\""); " " + t->param + "\"");
op->init(&error);
int ret = op->evaluate(NULL, t->input); int ret = op->evaluate(NULL, t->input);
if (ret != t->ret) { if (ret != t->ret) {