diff --git a/examples/multiprocess_c/multi.c b/examples/multiprocess_c/multi.c index caff92b5..2f2c43da 100644 --- a/examples/multiprocess_c/multi.c +++ b/examples/multiprocess_c/multi.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include @@ -24,12 +24,13 @@ #include #include + #define FORKS 5 #define REQUESTS_PER_PROCESS 100 char main_rule_uri[] = "basic_rules.conf"; -Rules *rules = NULL; +RulesSet *rules = NULL; ModSecurity *modsec = NULL; diff --git a/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h b/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h index 52ce11ed..44d060ec 100644 --- a/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h +++ b/examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h @@ -69,14 +69,14 @@ char ip[] = "200.249.12.31"; struct data_ms { modsecurity::ModSecurity *modsec; - modsecurity::Rules *rules; + modsecurity::RulesSet *rules; }; static void *process_request(void *data) { struct data_ms *a = (struct data_ms *)data; modsecurity::ModSecurity *modsec = a->modsec; - modsecurity::Rules *rules = a->rules; + modsecurity::RulesSet *rules = a->rules; int z = 0; for (z = 0; z < 10000; z++) { @@ -132,7 +132,7 @@ class ReadingLogsViaRuleMessage { void *status; modsecurity::ModSecurity *modsec; - modsecurity::Rules *rules; + modsecurity::RulesSet *rules; modsecurity::ModSecurityIntervention it; modsec = new modsecurity::ModSecurity(); @@ -141,7 +141,7 @@ class ReadingLogsViaRuleMessage { modsec->setServerLogCb(logCb, modsecurity::RuleMessageLogProperty | modsecurity::IncludeFullHighlightLogProperty); - rules = new modsecurity::Rules(); + rules = new modsecurity::RulesSet(); if (rules->loadFromUri(m_rules.c_str()) < 0) { std::cout << "Problems loading the rules..." << std::endl; std::cout << rules->m_parserError.str() << std::endl; diff --git a/examples/reading_logs_via_rule_message/simple_request.cc b/examples/reading_logs_via_rule_message/simple_request.cc index 0487abc7..02c4ebc4 100644 --- a/examples/reading_logs_via_rule_message/simple_request.cc +++ b/examples/reading_logs_via_rule_message/simple_request.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h" diff --git a/examples/simple_example_using_c/test.c b/examples/simple_example_using_c/test.c index 4a635830..3c1fc80e 100644 --- a/examples/simple_example_using_c/test.c +++ b/examples/simple_example_using_c/test.c @@ -18,7 +18,7 @@ #include #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" char main_rule_uri[] = "basic_rules.conf"; @@ -29,7 +29,7 @@ int main (int argc, char **argv) const char *error = NULL; ModSecurity *modsec; Transaction *transaction = NULL; - Rules *rules; + RulesSet *rules; modsec = msc_init(); diff --git a/examples/using_bodies_in_chunks/simple_request.cc b/examples/using_bodies_in_chunks/simple_request.cc index 0a766bc2..959cc9b6 100644 --- a/examples/using_bodies_in_chunks/simple_request.cc +++ b/examples/using_bodies_in_chunks/simple_request.cc @@ -19,7 +19,7 @@ #include -#include +#include #include @@ -28,6 +28,7 @@ + char request_uri[] = "/test.pl?param1=test¶2=test2"; char request_body_first[] = "" \ @@ -125,7 +126,7 @@ int process_intervention(modsecurity::Transaction *transaction) { int main(int argc, char **argv) { modsecurity::ModSecurity *modsec; - modsecurity::Rules *rules; + modsecurity::RulesSet *rules; modsecurity::ModSecurityIntervention it; if (argc < 2) { @@ -151,7 +152,7 @@ int main(int argc, char **argv) { * loading the rules.... * */ - rules = new modsecurity::Rules(); + rules = new modsecurity::RulesSet(); if (rules->loadFromUri(rules_arg.c_str()) < 0) { std::cout << "Problems loading the rules..." << std::endl; std::cout << rules->m_parserError.str() << std::endl; diff --git a/headers/modsecurity/rules.h b/headers/modsecurity/rules_set.h similarity index 78% rename from headers/modsecurity/rules.h rename to headers/modsecurity/rules_set.h index d78b7708..12868e80 100644 --- a/headers/modsecurity/rules.h +++ b/headers/modsecurity/rules_set.h @@ -42,9 +42,9 @@ class Driver; /** @ingroup ModSecurity_CPP_API */ -class Rules : public RulesProperties { +class RulesSet : public RulesProperties { public: - Rules() + RulesSet() : RulesProperties(new DebugLog()), unicode_codepage(0), #ifndef NO_LOGS @@ -52,7 +52,7 @@ class Rules : public RulesProperties { #endif m_referenceCount(0) { } - explicit Rules(DebugLog *customLog) + explicit RulesSet(DebugLog *customLog) : RulesProperties(customLog), unicode_codepage(0), #ifndef NO_LOGS @@ -60,7 +60,7 @@ class Rules : public RulesProperties { #endif m_referenceCount(0) { } - ~Rules() { } + ~RulesSet() { } void incrementReferenceCount(void); void decrementReferenceCount(void); @@ -73,7 +73,7 @@ class Rules : public RulesProperties { void dump(); int merge(Parser::Driver *driver); - int merge(Rules *rules); + int merge(RulesSet *rules); int evaluate(int phase, Transaction *transaction); std::string getParserError(); @@ -96,14 +96,14 @@ class Rules : public RulesProperties { extern "C" { #endif -Rules *msc_create_rules_set(void); -void msc_rules_dump(Rules *rules); -int msc_rules_merge(Rules *rules_dst, Rules *rules_from, const char **error); -int msc_rules_add_remote(Rules *rules, const char *key, const char *uri, +RulesSet *msc_create_rules_set(void); +void msc_rules_dump(RulesSet *rules); +int msc_rules_merge(RulesSet *rules_dst, RulesSet *rules_from, const char **error); +int msc_rules_add_remote(RulesSet *rules, const char *key, const char *uri, const char **error); -int msc_rules_add_file(Rules *rules, const char *file, const char **error); -int msc_rules_add(Rules *rules, const char *plain_rules, const char **error); -int msc_rules_cleanup(Rules *rules); +int msc_rules_add_file(RulesSet *rules, const char *file, const char **error); +int msc_rules_add(RulesSet *rules, const char *plain_rules, const char **error); +int msc_rules_cleanup(RulesSet *rules); #ifdef __cplusplus } diff --git a/headers/modsecurity/transaction.h b/headers/modsecurity/transaction.h index dd2e9cf8..a528faee 100644 --- a/headers/modsecurity/transaction.h +++ b/headers/modsecurity/transaction.h @@ -37,7 +37,7 @@ #ifndef __cplusplus typedef struct ModSecurity_t ModSecurity; typedef struct Transaction_t Transaction; -typedef struct Rules_t Rules; +typedef struct Rules_t RulesSet; #endif #include "modsecurity/anchored_set_variable.h" @@ -98,7 +98,7 @@ namespace modsecurity { class ModSecurity; class Transaction; -class Rules; +class RulesSet; class RuleMessage; namespace actions { class Action; @@ -288,8 +288,8 @@ class TransactionAnchoredVariables { /** @ingroup ModSecurity_CPP_API */ class Transaction : public TransactionAnchoredVariables { public: - Transaction(ModSecurity *transaction, Rules *rules, void *logCbData); - Transaction(ModSecurity *transaction, Rules *rules, char *id, + Transaction(ModSecurity *transaction, RulesSet *rules, void *logCbData); + Transaction(ModSecurity *transaction, RulesSet *rules, char *id, void *logCbData); ~Transaction(); @@ -455,7 +455,7 @@ class Transaction : public TransactionAnchoredVariables { /** * Rules object utilized during this specific transaction. */ - Rules *m_rules; + RulesSet *m_rules; /** * @@ -600,11 +600,11 @@ extern "C" { /** @ingroup ModSecurity_C_API */ Transaction *msc_new_transaction(ModSecurity *ms, - Rules *rules, void *logCbData); + RulesSet *rules, void *logCbData); /** @ingroup ModSecurity_C_API */ Transaction *msc_new_transaction_with_id(ModSecurity *ms, - Rules *rules, char *id, void *logCbData); + RulesSet *rules, char *id, void *logCbData); /** @ingroup ModSecurity_C_API */ int msc_process_connection(Transaction *transaction, diff --git a/src/Makefile.am b/src/Makefile.am index b6d23b01..d44bb7f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,7 @@ pkginclude_HEADERS = \ ../headers/modsecurity/modsecurity.h \ ../headers/modsecurity/rule.h \ ../headers/modsecurity/rule_message.h \ - ../headers/modsecurity/rules.h \ + ../headers/modsecurity/rules_set.h \ ../headers/modsecurity/rules_exceptions.h \ ../headers/modsecurity/rules_properties.h \ ../headers/modsecurity/transaction.h \ diff --git a/src/actions/block.cc b/src/actions/block.cc index 7227846e..7a6081a9 100644 --- a/src/actions/block.cc +++ b/src/actions/block.cc @@ -19,9 +19,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "modsecurity/rules.h" #include "modsecurity/intervention.h" #include "src/actions/data/status.h" diff --git a/src/actions/ctl/rule_engine.cc b/src/actions/ctl/rule_engine.cc index 34250269..18f7bd25 100644 --- a/src/actions/ctl/rule_engine.cc +++ b/src/actions/ctl/rule_engine.cc @@ -18,8 +18,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/rules_properties.h" -#include "modsecurity/rules.h" #include "modsecurity/transaction.h" namespace modsecurity { diff --git a/src/actions/disruptive/allow.cc b/src/actions/disruptive/allow.cc index bc2c614e..221fecc2 100644 --- a/src/actions/disruptive/allow.cc +++ b/src/actions/disruptive/allow.cc @@ -18,9 +18,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "modsecurity/rules.h" #include "src/utils/string.h" #include "modsecurity/modsecurity.h" diff --git a/src/actions/disruptive/deny.h b/src/actions/disruptive/deny.h index 0d8871ec..a74cd079 100644 --- a/src/actions/disruptive/deny.h +++ b/src/actions/disruptive/deny.h @@ -16,9 +16,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" #include "modsecurity/rule_message.h" #ifndef SRC_ACTIONS_DISRUPTIVE_DENY_H_ diff --git a/src/actions/disruptive/drop.cc b/src/actions/disruptive/drop.cc index 4af751b9..31bc8f05 100644 --- a/src/actions/disruptive/drop.cc +++ b/src/actions/disruptive/drop.cc @@ -21,7 +21,11 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" +#include "modsecurity/rule.h" +#include "src/utils/string.h" +#include "modsecurity/modsecurity.h" namespace modsecurity { namespace actions { diff --git a/src/actions/disruptive/drop.h b/src/actions/disruptive/drop.h index fc96aeeb..2a5b9431 100644 --- a/src/actions/disruptive/drop.h +++ b/src/actions/disruptive/drop.h @@ -18,7 +18,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" #include "modsecurity/rule_message.h" #ifndef SRC_ACTIONS_DISRUPTIVE_DROP_H_ diff --git a/src/actions/disruptive/pass.cc b/src/actions/disruptive/pass.cc index d07763ab..c8eb4447 100644 --- a/src/actions/disruptive/pass.cc +++ b/src/actions/disruptive/pass.cc @@ -19,9 +19,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "modsecurity/rules.h" #include "modsecurity/rule_message.h" namespace modsecurity { diff --git a/src/actions/exec.cc b/src/actions/exec.cc index eda7d29f..e3b1aa23 100644 --- a/src/actions/exec.cc +++ b/src/actions/exec.cc @@ -18,10 +18,10 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "modsecurity/rules.h" #include "src/utils/system.h" #include "src/engine/lua.h" diff --git a/src/actions/set_var.cc b/src/actions/set_var.cc index 8cb743e1..c972ffff 100644 --- a/src/actions/set_var.cc +++ b/src/actions/set_var.cc @@ -19,8 +19,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" #include "modsecurity/rule.h" #include "src/utils/string.h" #include "src/variables/global.h" diff --git a/src/actions/severity.cc b/src/actions/severity.cc index d90ce63b..6543cd11 100644 --- a/src/actions/severity.cc +++ b/src/actions/severity.cc @@ -19,10 +19,10 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "modsecurity/rules.h" #include "src/utils/string.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/skip.cc b/src/actions/skip.cc index 1b618fe0..8318dbd2 100644 --- a/src/actions/skip.cc +++ b/src/actions/skip.cc @@ -18,9 +18,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" namespace modsecurity { namespace actions { diff --git a/src/actions/skip_after.cc b/src/actions/skip_after.cc index ba07e73a..2460e5cd 100644 --- a/src/actions/skip_after.cc +++ b/src/actions/skip_after.cc @@ -18,9 +18,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" namespace modsecurity { diff --git a/src/actions/transformations/url_decode_uni.cc b/src/actions/transformations/url_decode_uni.cc index 88de1a4e..4af5c055 100644 --- a/src/actions/transformations/url_decode_uni.cc +++ b/src/actions/transformations/url_decode_uni.cc @@ -25,11 +25,11 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" #include "src/utils/string.h" #include "src/utils/system.h" -#include "modsecurity/rules.h" #include "modsecurity/rules_properties.h" @@ -108,7 +108,7 @@ int UrlDecodeUni::inplace(unsigned char *input, uint64_t input_len, } if (Code >= 0 && Code <= 65535) { - Rules *r = t->m_rules; + RulesSet *r = t->m_rules; hmap = r->m_unicodeMapTable.m_unicodeMapTable->at(Code); } } diff --git a/src/audit_log/writer/https.cc b/src/audit_log/writer/https.cc index 17cd3718..bce33b55 100644 --- a/src/audit_log/writer/https.cc +++ b/src/audit_log/writer/https.cc @@ -25,9 +25,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/audit_log.h" #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" #include "src/utils/md5.h" #include "src/utils/https_client.h" diff --git a/src/audit_log/writer/parallel.h b/src/audit_log/writer/parallel.h index 3a24a559..faf3c6fe 100644 --- a/src/audit_log/writer/parallel.h +++ b/src/audit_log/writer/parallel.h @@ -22,7 +22,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/audit_log.h" #include "src/utils/shared_files.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" #ifdef __cplusplus diff --git a/src/audit_log/writer/serial.h b/src/audit_log/writer/serial.h index 0cc12759..5e582483 100644 --- a/src/audit_log/writer/serial.h +++ b/src/audit_log/writer/serial.h @@ -26,7 +26,7 @@ #include "src/utils/shared_files.h" #include "modsecurity/transaction.h" #include "modsecurity/audit_log.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" #ifdef __cplusplus diff --git a/src/operators/rbl.cc b/src/operators/rbl.cc index 5cf794d9..8d6b8b87 100644 --- a/src/operators/rbl.cc +++ b/src/operators/rbl.cc @@ -15,7 +15,6 @@ #include "src/operators/rbl.h" -#include #include #include #include @@ -24,6 +23,7 @@ #include +#include "modsecurity/rules_set.h" #include "src/operators/operator.h" namespace modsecurity { diff --git a/src/parser/driver.h b/src/parser/driver.h index 2d9cfc7a..43f1c40b 100644 --- a/src/parser/driver.h +++ b/src/parser/driver.h @@ -25,14 +25,14 @@ #define SRC_PARSER_DRIVER_H_ #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" #include "modsecurity/rules_properties.h" #include "modsecurity/audit_log.h" #include "src/rule_script.h" #include "src/parser/seclang-parser.hh" using modsecurity::Rule; -using modsecurity::Rules; +using modsecurity::RulesSet; # define YY_DECL \ diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc index 5dd9f878..80837e1e 100644 --- a/src/parser/seclang-parser.cc +++ b/src/parser/seclang-parser.cc @@ -2201,7 +2201,7 @@ namespace yy { case 79: #line 1243 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_secRuleEngine = modsecurity::Rules::DisabledRuleEngine; + driver.m_secRuleEngine = modsecurity::RulesSet::DisabledRuleEngine; } #line 2207 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2209,7 +2209,7 @@ namespace yy { case 80: #line 1247 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_secRuleEngine = modsecurity::Rules::EnabledRuleEngine; + driver.m_secRuleEngine = modsecurity::RulesSet::EnabledRuleEngine; } #line 2215 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2217,7 +2217,7 @@ namespace yy { case 81: #line 1251 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_secRuleEngine = modsecurity::Rules::DetectionOnlyRuleEngine; + driver.m_secRuleEngine = modsecurity::RulesSet::DetectionOnlyRuleEngine; } #line 2223 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2774,7 +2774,7 @@ namespace yy { case 130: #line 1615 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_requestBodyLimitAction = modsecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction; + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; } #line 2780 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2782,7 +2782,7 @@ namespace yy { case 131: #line 1619 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_requestBodyLimitAction = modsecurity::Rules::BodyLimitAction::RejectBodyLimitAction; + driver.m_requestBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; } #line 2788 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2790,7 +2790,7 @@ namespace yy { case 132: #line 1623 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_responseBodyLimitAction = modsecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction; + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction; } #line 2796 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2798,7 +2798,7 @@ namespace yy { case 133: #line 1627 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_responseBodyLimitAction = modsecurity::Rules::BodyLimitAction::RejectBodyLimitAction; + driver.m_responseBodyLimitAction = modsecurity::RulesSet::BodyLimitAction::RejectBodyLimitAction; } #line 2804 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2806,7 +2806,7 @@ namespace yy { case 134: #line 1631 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; } #line 2812 "seclang-parser.cc" // lalr1.cc:906 break; @@ -2814,7 +2814,7 @@ namespace yy { case 135: #line 1635 "seclang-parser.yy" // lalr1.cc:906 { - driver.m_remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; + driver.m_remoteRulesActionOnFailed = RulesSet::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; } #line 2820 "seclang-parser.cc" // lalr1.cc:906 break; diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc index 176e781d..619fa404 100644 --- a/src/parser/seclang-scanner.cc +++ b/src/parser/seclang-scanner.cc @@ -8490,10 +8490,10 @@ YY_RULE_SETUP if (ret == false) { BEGIN(INITIAL); - if (driver.m_remoteRulesActionOnFailed == Rules::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction) { + if (driver.m_remoteRulesActionOnFailed == RulesSet::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction) { /** TODO: Implement the server logging mechanism. */ } - if (driver.m_remoteRulesActionOnFailed == Rules::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction) { + if (driver.m_remoteRulesActionOnFailed == RulesSet::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction) { driver.error (*driver.loc.back(), "", yytext + std::string(" - Failed to download: ") + c.error); throw p::syntax_error(*driver.loc.back(), ""); } diff --git a/src/request_body_processor/json.h b/src/request_body_processor/json.h index 8c4c502d..0afae773 100644 --- a/src/request_body_processor/json.h +++ b/src/request_body_processor/json.h @@ -26,7 +26,7 @@ #include #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc index f302720a..d0fc5caf 100644 --- a/src/request_body_processor/multipart.cc +++ b/src/request_body_processor/multipart.cc @@ -27,8 +27,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/collection/collections.h" -#include "modsecurity/rules.h" #include "src/utils/string.h" diff --git a/src/request_body_processor/xml.h b/src/request_body_processor/xml.h index 465cc111..aa24535e 100644 --- a/src/request_body_processor/xml.h +++ b/src/request_body_processor/xml.h @@ -22,7 +22,7 @@ #include #include "modsecurity/transaction.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" #ifndef SRC_REQUEST_BODY_PROCESSOR_XML_H_ #define SRC_REQUEST_BODY_PROCESSOR_XML_H_ diff --git a/src/rule.cc b/src/rule.cc index 70f281e0..ade75e58 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -25,13 +25,13 @@ #include #include +#include "modsecurity/rules_set.h" #include "src/operators/operator.h" #include "modsecurity/actions/action.h" #include "modsecurity/modsecurity.h" #include "src/actions/transformations/none.h" #include "src/actions/tag.h" #include "src/utils/string.h" -#include "modsecurity/rules.h" #include "modsecurity/rule_message.h" #include "src/actions/msg.h" #include "src/actions/log_data.h" @@ -562,7 +562,7 @@ void Rule::executeAction(Transaction *trans, return; } - if (trans->getRuleEngineState() == Rules::EnabledRuleEngine) { + if (trans->getRuleEngineState() == RulesSet::EnabledRuleEngine) { ms_dbg_a(trans, 4, "Running (disruptive) action: " + a->m_name + \ "."); a->evaluate(this, trans, ruleMessage); diff --git a/src/rule_message.cc b/src/rule_message.cc index aab92180..4255e53e 100644 --- a/src/rule_message.cc +++ b/src/rule_message.cc @@ -13,10 +13,9 @@ * */ -#include "modsecurity/rules.h" - #include "modsecurity/rule_message.h" +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" #include "modsecurity/transaction.h" #include "src/utils/string.h" diff --git a/src/rule_script.h b/src/rule_script.h index 9b446632..1e35635e 100644 --- a/src/rule_script.h +++ b/src/rule_script.h @@ -18,6 +18,7 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/rule.h" #include "src/engine/lua.h" #include "src/operators/operator.h" @@ -26,7 +27,6 @@ #include "src/actions/transformations/none.h" #include "src/actions/tag.h" #include "src/utils/string.h" -#include "modsecurity/rules.h" #include "modsecurity/rule_message.h" #include "src/actions/msg.h" #include "src/actions/log_data.h" diff --git a/src/rules.cc b/src/rules.cc index f5b16cab..9eac60b0 100644 --- a/src/rules.cc +++ b/src/rules.cc @@ -13,14 +13,13 @@ * */ -#include "modsecurity/rules.h" - #include #include #include #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" #include "modsecurity/transaction.h" #include "src/parser/driver.h" @@ -47,7 +46,7 @@ namespace modsecurity { * @return Number of the current transactions using this rules * */ -void Rules::incrementReferenceCount(void) { +void RulesSet::incrementReferenceCount(void) { this->m_referenceCount++; } @@ -60,7 +59,7 @@ void Rules::incrementReferenceCount(void) { * @return Number of the current transactions using this rules * */ -void Rules::decrementReferenceCount(void) { +void RulesSet::decrementReferenceCount(void) { this->m_referenceCount--; if (this->m_referenceCount == 0) { /** @@ -92,7 +91,7 @@ void Rules::decrementReferenceCount(void) { * @retval false Problem loading the rules. * */ -int Rules::loadFromUri(const char *uri) { +int RulesSet::loadFromUri(const char *uri) { Driver *driver = new Driver(); if (driver->parseFile(uri) == false) { @@ -108,7 +107,7 @@ int Rules::loadFromUri(const char *uri) { } -int Rules::load(const char *file, const std::string &ref) { +int RulesSet::load(const char *file, const std::string &ref) { Driver *driver = new Driver(); if (driver->parse(file, ref) == false) { @@ -128,7 +127,7 @@ int Rules::load(const char *file, const std::string &ref) { } -int Rules::loadRemote(const char *key, const char *uri) { +int RulesSet::loadRemote(const char *key, const char *uri) { HttpsClient client; client.setKey(key); bool ret = client.download(uri); @@ -141,17 +140,17 @@ int Rules::loadRemote(const char *key, const char *uri) { } -int Rules::load(const char *plainRules) { +int RulesSet::load(const char *plainRules) { return this->load(plainRules, ""); } -std::string Rules::getParserError() { +std::string RulesSet::getParserError() { return this->m_parserError.str(); } -int Rules::evaluate(int phase, Transaction *t) { +int RulesSet::evaluate(int phase, Transaction *t) { if (phase >= modsecurity::Phases::NUMBER_OF_PHASES) { return 0; } @@ -261,7 +260,7 @@ int Rules::evaluate(int phase, Transaction *t) { } -int Rules::merge(Driver *from) { +int RulesSet::merge(Driver *from) { int amount_of_rules = 0; amount_of_rules = mergeProperties( dynamic_cast(from), @@ -272,7 +271,7 @@ int Rules::merge(Driver *from) { } -int Rules::merge(Rules *from) { +int RulesSet::merge(RulesSet *from) { int amount_of_rules = 0; amount_of_rules = mergeProperties( dynamic_cast(from), @@ -283,7 +282,7 @@ int Rules::merge(Rules *from) { } -void Rules::debug(int level, const std::string &id, +void RulesSet::debug(int level, const std::string &id, const std::string &uri, const std::string &msg) { if (m_debugLog != NULL) { m_debugLog->write(level, id, uri, msg); @@ -291,7 +290,7 @@ void Rules::debug(int level, const std::string &id, } -void Rules::dump() { +void RulesSet::dump() { std::cout << "Rules: " << std::endl; for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) { std::vector rules = m_rules[i]; @@ -306,18 +305,18 @@ void Rules::dump() { } -extern "C" Rules *msc_create_rules_set(void) { - return new Rules(); +extern "C" RulesSet *msc_create_rules_set(void) { + return new RulesSet(); } -extern "C" void msc_rules_dump(Rules *rules) { +extern "C" void msc_rules_dump(RulesSet *rules) { rules->dump(); } -extern "C" int msc_rules_merge(Rules *rules_dst, - Rules *rules_from, const char **error) { +extern "C" int msc_rules_merge(RulesSet *rules_dst, + RulesSet *rules_from, const char **error) { int ret = rules_dst->merge(rules_from); if (ret < 0) { *error = strdup(rules_dst->getParserError().c_str()); @@ -326,7 +325,7 @@ extern "C" int msc_rules_merge(Rules *rules_dst, } -extern "C" int msc_rules_add_remote(Rules *rules, +extern "C" int msc_rules_add_remote(RulesSet *rules, const char *key, const char *uri, const char **error) { int ret = rules->loadRemote(key, uri); if (ret < 0) { @@ -336,7 +335,7 @@ extern "C" int msc_rules_add_remote(Rules *rules, } -extern "C" int msc_rules_add_file(Rules *rules, const char *file, +extern "C" int msc_rules_add_file(RulesSet *rules, const char *file, const char **error) { int ret = rules->loadFromUri(file); if (ret < 0) { @@ -346,7 +345,7 @@ extern "C" int msc_rules_add_file(Rules *rules, const char *file, } -extern "C" int msc_rules_add(Rules *rules, const char *plain_rules, +extern "C" int msc_rules_add(RulesSet *rules, const char *plain_rules, const char **error) { int ret = rules->load(plain_rules); if (ret < 0) { @@ -356,7 +355,7 @@ extern "C" int msc_rules_add(Rules *rules, const char *plain_rules, } -extern "C" int msc_rules_cleanup(Rules *rules) { +extern "C" int msc_rules_cleanup(RulesSet *rules) { delete rules; return true; } diff --git a/src/transaction.cc b/src/transaction.cc index 693bed6b..021fc0c5 100644 --- a/src/transaction.cc +++ b/src/transaction.cc @@ -99,7 +99,7 @@ namespace modsecurity { * @endcode * */ -Transaction::Transaction(ModSecurity *ms, Rules *rules, void *logCbData) +Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData) : m_clientPort(0), m_serverPort(0), m_uri_no_query_string_decoded(""), @@ -110,7 +110,7 @@ Transaction::Transaction(ModSecurity *ms, Rules *rules, void *logCbData) m_ARGScombinedSizeDouble(0), m_requestBodyType(UnknownFormat), m_requestBodyProcessor(UnknownFormat), - m_requestBodyAccess(Rules::PropertyNotSetConfigBoolean), + m_requestBodyAccess(RulesSet::PropertyNotSetConfigBoolean), m_marker(""), m_allowType(modsecurity::actions::disruptive::NoneAllowType), m_skip_next(0), @@ -143,7 +143,7 @@ Transaction::Transaction(ModSecurity *ms, Rules *rules, void *logCbData) intervention::clean(&m_it); } -Transaction::Transaction(ModSecurity *ms, Rules *rules, char *id, void *logCbData) +Transaction::Transaction(ModSecurity *ms, RulesSet *rules, char *id, void *logCbData) : m_clientPort(0), m_serverPort(0), m_uri_no_query_string_decoded(""), @@ -154,7 +154,7 @@ Transaction::Transaction(ModSecurity *ms, Rules *rules, char *id, void *logCbDat m_ARGScombinedSizeDouble(0), m_requestBodyType(UnknownFormat), m_requestBodyProcessor(UnknownFormat), - m_requestBodyAccess(Rules::PropertyNotSetConfigBoolean), + m_requestBodyAccess(RulesSet::PropertyNotSetConfigBoolean), m_marker(""), m_allowType(modsecurity::actions::disruptive::NoneAllowType), m_skip_next(0), @@ -512,7 +512,7 @@ int Transaction::processURI(const char *uri, const char *method, int Transaction::processRequestHeaders() { ms_dbg(4, "Starting phase REQUEST_HEADERS. (SecRules 1)"); - if (getRuleEngineState() == Rules::DisabledRuleEngine) { + if (getRuleEngineState() == RulesSet::DisabledRuleEngine) { ms_dbg(4, "Rule engine disabled, returning..."); return true; } @@ -911,7 +911,7 @@ int Transaction::appendRequestBody(const unsigned char *buf, size_t len) { ms_dbg(5, "Request body is bigger than the maximum expected."); if (this->m_rules->m_requestBodyLimitAction == - Rules::BodyLimitAction::ProcessPartialBodyLimitAction) { + RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction) { size_t spaceLeft = this->m_rules->m_requestBodyLimit.m_value - current_size; this->m_requestBody.write(reinterpret_cast(buf), @@ -920,7 +920,7 @@ int Transaction::appendRequestBody(const unsigned char *buf, size_t len) { return false; } else { if (this->m_rules->m_requestBodyLimitAction == - Rules::BodyLimitAction::RejectBodyLimitAction) { + RulesSet::BodyLimitAction::RejectBodyLimitAction) { ms_dbg(5, "Request body limit is marked to reject the " \ "request"); intervention::free(&m_it); @@ -963,7 +963,7 @@ int Transaction::processResponseHeaders(int code, const std::string& proto) { m_variableResponseStatus.set(std::to_string(code), m_variableOffset); m_variableResponseProtocol.set(proto, m_variableOffset); - if (getRuleEngineState() == Rules::DisabledRuleEngine) { + if (getRuleEngineState() == RulesSet::DisabledRuleEngine) { ms_dbg(4, "Rule engine disabled, returning..."); return true; } @@ -1084,7 +1084,7 @@ int Transaction::addResponseHeader(const unsigned char *key, size_t key_n, int Transaction::processResponseBody() { ms_dbg(4, "Starting phase RESPONSE_BODY. (SecRules 4)"); - if (getRuleEngineState() == Rules::DisabledRuleEngine) { + if (getRuleEngineState() == RulesSet::DisabledRuleEngine) { ms_dbg(4, "Rule engine disabled, returning..."); return true; } @@ -1165,7 +1165,7 @@ int Transaction::appendResponseBody(const unsigned char *buf, size_t len) { m_variableOutboundDataError.set("1", m_variableOffset); ms_dbg(5, "Response body is bigger than the maximum expected."); if (this->m_rules->m_responseBodyLimitAction == - Rules::BodyLimitAction::ProcessPartialBodyLimitAction) { + RulesSet::BodyLimitAction::ProcessPartialBodyLimitAction) { size_t spaceLeft = this->m_rules->m_responseBodyLimit.m_value \ - current_size; this->m_responseBody.write(reinterpret_cast(buf), @@ -1174,7 +1174,7 @@ int Transaction::appendResponseBody(const unsigned char *buf, size_t len) { return false; } else { if (this->m_rules->m_responseBodyLimitAction == - Rules::BodyLimitAction::RejectBodyLimitAction) { + RulesSet::BodyLimitAction::RejectBodyLimitAction) { ms_dbg(5, "Response body limit is marked to reject the " \ "request"); intervention::free(&m_it); @@ -1267,7 +1267,7 @@ size_t Transaction::getRequestBodyLength() { int Transaction::processLogging() { ms_dbg(4, "Starting phase LOGGING. (SecRules 5)"); - if (getRuleEngineState() == Rules::DisabledRuleEngine) { + if (getRuleEngineState() == RulesSet::DisabledRuleEngine) { ms_dbg(4, "Rule engine disabled, returning..."); return true; } @@ -1626,7 +1626,7 @@ std::string Transaction::toJSON(int parts) { /* producer > engine state */ LOGFY_ADD("secrules_engine", - Rules::ruleEngineStateString( + RulesSet::ruleEngineStateString( (RulesProperties::RuleEngine) getRuleEngineState())); /* producer > components */ @@ -1765,11 +1765,11 @@ int Transaction::updateStatusCode(int code) { * */ extern "C" Transaction *msc_new_transaction(ModSecurity *ms, - Rules *rules, void *logCbData) { + RulesSet *rules, void *logCbData) { return new Transaction(ms, rules, logCbData); } extern "C" Transaction *msc_new_transaction_with_id(ModSecurity *ms, - Rules *rules, char *id, void *logCbData) { + RulesSet *rules, char *id, void *logCbData) { return new Transaction(ms, rules, id, logCbData); } diff --git a/src/variables/variable.h b/src/variables/variable.h index 7a63391f..18e1ebed 100644 --- a/src/variables/variable.h +++ b/src/variables/variable.h @@ -21,9 +21,9 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "modsecurity/rules.h" #include "src/utils/string.h" #include "src/utils/regex.h" diff --git a/src/variables/xml.cc b/src/variables/xml.cc index 7fe47157..dd8dc022 100644 --- a/src/variables/xml.cc +++ b/src/variables/xml.cc @@ -37,7 +37,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/rules_properties.h" -#include "modsecurity/rules.h" +#include "modsecurity/rules_set.h" #include "src/request_body_processor/xml.h" #include "modsecurity/actions/action.h" diff --git a/test/benchmark/benchmark.cc b/test/benchmark/benchmark.cc index 0ec083f1..ebd2976d 100644 --- a/test/benchmark/benchmark.cc +++ b/test/benchmark/benchmark.cc @@ -19,8 +19,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" using modsecurity::Transaction; @@ -71,14 +71,14 @@ int main(int argc, char *argv[]) { } std::cout << "Doing " << NUM_REQUESTS << " transactions...\n"; modsecurity::ModSecurity *modsec; - modsecurity::Rules *rules; + modsecurity::RulesSet *rules; modsecurity::ModSecurityIntervention it; modsecurity::intervention::reset(&it); modsec = new modsecurity::ModSecurity(); modsec->setConnectorInformation("ModSecurity-benchmark v0.0.1-alpha" \ " (ModSecurity benchmark utility)"); - rules = new modsecurity::Rules(); + rules = new modsecurity::RulesSet(); if (rules->loadFromUri(rules_file) < 0) { std::cout << "Problems loading the rules..." << std::endl; std::cout << rules->m_parserError.str() << std::endl; diff --git a/test/fuzzer/afl_fuzzer.cc b/test/fuzzer/afl_fuzzer.cc index 936a56ac..7bdec3fe 100644 --- a/test/fuzzer/afl_fuzzer.cc +++ b/test/fuzzer/afl_fuzzer.cc @@ -15,9 +15,8 @@ #include - +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" #include "src/actions/transformations/transformation.h" /** @@ -135,7 +134,7 @@ int main(int argc, char** argv) { std::string z = lastString; ModSecurity *ms = new ModSecurity(); - Rules *rules = new Rules(); + RulesSet *rules = new RulesSet(); // Here it is possible to load a real transaction from a JSON. // like we do on the regression tests. Transaction *t = new Transaction(ms, rules, NULL); diff --git a/test/optimization/optimization.cc b/test/optimization/optimization.cc index ea8ac4c9..4ba00e89 100644 --- a/test/optimization/optimization.cc +++ b/test/optimization/optimization.cc @@ -20,8 +20,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" #include "src/utils/system.h" #include "src/parser/driver.h" #include "src/utils/https_client.h" @@ -36,7 +36,7 @@ void print_help() { int main(int argc, char **argv) { - modsecurity::Rules *modsecRules = new modsecurity::Rules(); + modsecurity::RulesSet *modsecRules = new modsecurity::RulesSet(); std::list files; int total = 0; diff --git a/test/regression/regression.cc b/test/regression/regression.cc index 6f5b3a44..60b84516 100644 --- a/test/regression/regression.cc +++ b/test/regression/regression.cc @@ -21,9 +21,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" - #include "test/common/modsecurity_test.h" #include "test/common/colors.h" #include "test/regression/regression_test.h" @@ -97,7 +96,7 @@ void perform_unit_test(ModSecurityTest *test, for (RegressionTest *t : *tests) { CustomDebugLog *debug_log = new CustomDebugLog(); modsecurity::ModSecurity *modsec = NULL; - modsecurity::Rules *modsec_rules = NULL; + modsecurity::RulesSet *modsec_rules = NULL; modsecurity::Transaction *modsec_transaction = NULL; ModSecurityTestResults r; std::stringstream serverLog; @@ -140,7 +139,7 @@ void perform_unit_test(ModSecurityTest *test, modsec->setConnectorInformation("ModSecurity-regression v0.0.1-alpha" \ " (ModSecurity regression test utility)"); modsec->setServerLogCb(logCb); - modsec_rules = new modsecurity::Rules(debug_log); + modsec_rules = new modsecurity::RulesSet(debug_log); bool found = true; if (t->resource.empty() == false) { diff --git a/test/unit/unit.cc b/test/unit/unit.cc index 4d88a771..513a1e8a 100644 --- a/test/unit/unit.cc +++ b/test/unit/unit.cc @@ -20,9 +20,8 @@ #include #include - +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" #include "src/operators/operator.h" #include "src/actions/transformations/transformation.h" #include "modsecurity/transaction.h" diff --git a/tools/rules-check/rules-check.cc b/tools/rules-check/rules-check.cc index fac28923..0f71647c 100644 --- a/tools/rules-check/rules-check.cc +++ b/tools/rules-check/rules-check.cc @@ -21,8 +21,8 @@ #include #include +#include "modsecurity/rules_set.h" #include "modsecurity/modsecurity.h" -#include "modsecurity/rules.h" void print_help(const char *name) { @@ -32,9 +32,9 @@ void print_help(const char *name) { int main(int argc, char **argv) { - modsecurity::Rules *rules; + modsecurity::RulesSet *rules; char **args = argv; - rules = new modsecurity::Rules(); + rules = new modsecurity::RulesSet(); int ret = 0; args++;