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

Avoids unicode initialization on every rules block

Browse Source 
ModSecurity-nginx/#67
ModSecurity/#1563
This commit is contained in:
Felipe Zimmerle
2017-10-11 12:37:13 -03:00
parent 20edf9ab77
commit 1ad95254cd
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
headers/modsecurity/rules.h
View File

@@ -40,6 +40,7 @@ namespace Parser {
class Driver;
}
/** @ingroup ModSecurity_CPP_API */
class Rules : public RulesProperties {
public:
@@ -47,23 +48,15 @@ class Rules : public RulesProperties {
: RulesProperties(new DebugLog()),
unicode_codepage(0),
m_referenceCount(0),
m_secmarker_skipped(0) {
unicode_map_table = reinterpret_cast<int *>(
malloc(sizeof(int)*65536));
memset(unicode_map_table, -1, (sizeof(int)*65536));
}
m_secmarker_skipped(0) { }
explicit Rules(DebugLog *customLog)
: RulesProperties(customLog),
unicode_codepage(0),
m_referenceCount(0),
m_secmarker_skipped(0) {
unicode_map_table = reinterpret_cast<int *>(
malloc(sizeof(int)*65536));
memset(unicode_map_table, -1, (sizeof(int)*65536));
}
m_secmarker_skipped(0) { }
~Rules();
~Rules() { }
void incrementReferenceCount(void);
void decrementReferenceCount(void);
@@ -83,7 +76,6 @@ class Rules : public RulesProperties {
void debug(int level, std::string message);
int *unicode_map_table;
int64_t unicode_codepage;
private:

14
headers/modsecurity/rules_properties.h
View File

@@ -79,6 +79,14 @@ class ConfigSet {
std::set<std::string> m_value;
};
class ConfigUnicodeMap {
public:
ConfigUnicodeMap() : m_set(false), m_unicode_map_table(NULL) { }
bool m_set;
int *m_unicode_map_table;
};
class RulesProperties {
public:
RulesProperties() :
@@ -332,6 +340,11 @@ class RulesProperties {
from->m_secArgumentSeparator.m_value;
}
if (from->m_unicodeMapTable.m_set == true) {
to->m_unicodeMapTable.m_unicode_map_table = \
from->m_unicodeMapTable.m_unicode_map_table;
}
if (from->m_httpblKey.m_set == true) {
to->m_httpblKey.m_value = from->m_httpblKey.m_value;
to->m_httpblKey.m_set = from->m_httpblKey.m_set;
@@ -469,6 +482,7 @@ class RulesProperties {
ConfigString m_secArgumentSeparator;
std::vector<actions::Action *> m_defaultActions[8];
std::vector<modsecurity::Rule *> m_rules[8];
ConfigUnicodeMap m_unicodeMapTable;
};
#endif