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

Refactoring: Renames RulesProperties to RulesSetProperties

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-11-13 16:08:27 -03:00
parent 6be31e2f88
commit f20a57407a
21 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headers/modsecurity/rules_set.h
View File

@@ -28,7 +28,7 @@
#ifndef HEADERS_MODSECURITY_RULES_H_
#define HEADERS_MODSECURITY_RULES_H_
#include "modsecurity/rules_properties.h"
#include "modsecurity/rules_set_properties.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/transaction.h"
@@ -42,10 +42,10 @@ class Driver;
/** @ingroup ModSecurity_CPP_API */
class RulesSet : public RulesProperties {
class RulesSet : public RulesSetProperties {
public:
RulesSet()
: RulesProperties(new DebugLog()),
: RulesSetProperties(new DebugLog()),
unicode_codepage(0),
#ifndef NO_LOGS
m_secmarker_skipped(0),
@@ -53,7 +53,7 @@ class RulesSet : public RulesProperties {
m_referenceCount(0) { }
explicit RulesSet(DebugLog *customLog)
: RulesProperties(customLog),
: RulesSetProperties(customLog),
unicode_codepage(0),
#ifndef NO_LOGS
m_secmarker_skipped(0),

20
headers/modsecurity/rules_properties.h → headers/modsecurity/rules_set_properties.h
View File

@@ -25,8 +25,8 @@
#endif
#ifndef HEADERS_MODSECURITY_RULES_PROPERTIES_H_
#define HEADERS_MODSECURITY_RULES_PROPERTIES_H_
#ifndef HEADERS_MODSECURITY_RULES_SET_PROPERTIES_H_
#define HEADERS_MODSECURITY_RULES_SET_PROPERTIES_H_
#include "modsecurity/modsecurity.h"
@@ -140,7 +140,7 @@ class UnicodeMapHolder {
};
class RulesProperties;
class RulesSetProperties;
class ConfigUnicodeMap {
public:
ConfigUnicodeMap() : m_set(false),
@@ -148,7 +148,7 @@ class ConfigUnicodeMap {
m_unicodeMapTable(NULL) { }
static void loadConfig(std::string f, double codePage,
RulesProperties *driver, std::string *errg);
RulesSetProperties *driver, std::string *errg);
void merge(ConfigUnicodeMap *from) {
if (from->m_set == false) {
@@ -168,9 +168,9 @@ class ConfigUnicodeMap {
};
class RulesProperties {
class RulesSetProperties {
public:
RulesProperties() :
RulesSetProperties() :
m_auditLog(new AuditLog()),
m_requestBodyLimitAction(PropertyNotSetBodyLimitAction),
m_responseBodyLimitAction(PropertyNotSetBodyLimitAction),
@@ -184,7 +184,7 @@ class RulesProperties {
m_secRuleEngine(PropertyNotSetRuleEngine) { }
explicit RulesProperties(DebugLog *debugLog) :
explicit RulesSetProperties(DebugLog *debugLog) :
m_auditLog(new AuditLog()),
m_requestBodyLimitAction(PropertyNotSetBodyLimitAction),
m_responseBodyLimitAction(PropertyNotSetBodyLimitAction),
@@ -198,7 +198,7 @@ class RulesProperties {
m_secRuleEngine(PropertyNotSetRuleEngine) { }
~RulesProperties() {
~RulesSetProperties() {
int i = 0;
/** Cleanup the rules */
for (i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
@@ -350,7 +350,7 @@ class RulesProperties {
}
static int mergeProperties(RulesProperties *from, RulesProperties *to,
static int mergeProperties(RulesSetProperties *from, RulesSetProperties *to,
std::ostringstream *err) {
int amount_of_rules = 0;
@@ -558,4 +558,4 @@ class RulesProperties {
} // namespace modsecurity
#endif
#endif // HEADERS_MODSECURITY_RULES_PROPERTIES_H_
#endif // HEADERS_MODSECURITY_RULES_SET_PROPERTIES_H_