github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-17 18:05:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better error handling when loading configurations

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-03-21 09:45:04 -03:00
parent f06ce3b394
commit 726c99af12
8 changed files with 141 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
headers/modsecurity/rules_set.h
View File

@@ -22,6 +22,7 @@
#include <string>
#include <vector>
#include <list>
#include <memory>
#endif
@@ -42,8 +43,6 @@ namespace Parser {
class Driver;
}
/** @ingroup ModSecurity_CPP_API */
class RulesSet : public RulesSetProperties {
public:
@@ -68,12 +67,13 @@ class RulesSet : public RulesSetProperties {
int load(const char *rules);
int load(const char *rules, const std::string &ref);
void dump() const;
void dump();
int merge(Parser::Driver *driver);
int merge(RulesSet *rules);
int evaluate(int phase, Transaction *transaction);
std::string getParserError();
void debug(int level, const std::string &id, const std::string &uri,
@@ -81,6 +81,7 @@ class RulesSet : public RulesSetProperties {
RulesSetPhases m_rulesSetPhases;
private:
bool containsDuplicatedIds(RulesWarnings *warnings, RulesErrors *errors);
#ifndef NO_LOGS
uint8_t m_secmarker_skipped;
#endif