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

Driver class is extending the Rules class instead of duplicate elements

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-07-23 00:08:57 -03:00
parent dc0b13ad74
commit d3eb0fd913
6 changed files with 25 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/parser/driver.h
View File

@@ -26,11 +26,13 @@
#include "modsecurity/modsecurity.h"
#include "src/rule.h"
#include "modsecurity/rules.h"
#include "src/audit_log.h"
#include "parser/seclang-parser.hh"
using ModSecurity::Rule;
using ModSecurity::Rules;
# define YY_DECL \
yy::seclang_parser::symbol_type yylex(Driver& driver)
@@ -45,7 +47,7 @@ typedef struct Driver_t Driver;
#endif
class Driver {
class Driver : public Rules {
/**
* @todo Place driver and parser under the correct namespace.
*
@@ -79,28 +81,8 @@ class Driver {
// Error handling.
void error(const yy::location& l, const std::string& m);
void parser_error(const yy::location& l, const std::string& m);
void error(const yy::location& l, const std::string& m, const std::string& c);
std::vector<Rule *> rules[7]; // Number of Phases.
ModSecurity::Rules::RuleEngine secRuleEngine;
int sec_audit_type;
bool sec_audit_engine;
bool sec_request_body_access;
bool sec_response_body_access;
int requestBodyLimit;
int responseBodyLimit;
int requestBodyLimitAction;
int responseBodyLimitAction;
std::string debug_log_path;
std::list<std::string> components;
std::ostringstream parserError;
std::ostringstream syntaxError;
ModSecurity::AuditLog *audit_log;
int debug_level;
void error(const yy::location& l, const std::string& m,
const std::string& c);
};
#endif // SRC_PARSER_DRIVER_H_