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

Refactoring: Renames Rules to RulesSet

Browse Source 
RulesSet does not only contain rules but alse properties
This commit is contained in:
Felipe Zimmerle
2018-11-13 15:29:55 -03:00
parent 6d5198b1a6
commit 7fce7b384b
46 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
headers/modsecurity/rules.h → headers/modsecurity/rules_set.h
View File

@@ -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
}

14
headers/modsecurity/transaction.h
View File

@@ -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,