github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix SecUnicodeMapFile support

Browse Source 
Makes SecUnicodeMapFile read the file and adjust transformation to use the
right variable.
This commit is contained in:
Victor Hora
2018-10-30 18:11:01 -04:00
committed by Felipe Zimmerle
parent 84ece3edcb
commit e3b9f7c913
12 changed files with 5885 additions and 5807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
headers/modsecurity/rules_properties.h
View File

@@ -21,6 +21,7 @@
#include <vector>
#include <list>
#include <set>
#include <cstring>
#endif
@@ -34,6 +35,7 @@
#include "modsecurity/actions/action.h"
#include "modsecurity/audit_log.h"
#define CODEPAGE_SEPARATORS " \t\n\r"
#ifdef __cplusplus
@@ -80,14 +82,34 @@ class ConfigSet {
};
class RulesProperties;
class ConfigUnicodeMap {
public:
ConfigUnicodeMap() : m_set(false), m_unicode_map_table(NULL), m_unicode_codepage(0) { }
ConfigUnicodeMap() : m_set(false),
m_unicodeCodePage(0),
m_unicodeMapTable(NULL) { }
static void loadConfig(std::string f, double codePage,
RulesProperties *driver, std::string *errg);
void merge(ConfigUnicodeMap *from) {
if (from->m_set == false) {
return;
}
m_set = true;
m_unicodeCodePage = from->m_unicodeCodePage;
m_unicodeMapTable = from->m_unicodeMapTable;
return;
}
bool m_set;
int *m_unicode_map_table;
unsigned long int m_unicode_codepage;
double m_unicodeCodePage;
std::shared_ptr<int[]> m_unicodeMapTable;
};
class RulesProperties {
public:
RulesProperties() :
@@ -350,13 +372,7 @@ class RulesProperties {
to->m_secWebAppId.m_set = true;
}
if (from->m_unicodeMapTable.m_set == true) {
to->m_unicodeMapTable.m_unicode_map_table = \
from->m_unicodeMapTable.m_unicode_map_table;
to->m_unicodeMapTable.m_unicode_codepage = \
from->m_unicodeMapTable.m_unicode_codepage;
to->m_unicodeMapTable.m_set = true;
}
to->m_unicodeMapTable.merge(&from->m_unicodeMapTable);
if (from->m_httpblKey.m_set == true) {
to->m_httpblKey.m_value = from->m_httpblKey.m_value;
@@ -508,6 +524,7 @@ class RulesProperties {
ConfigUnicodeMap m_unicodeMapTable;
};
#endif
#ifdef __cplusplus