Fix SecUnicodeMapFile support

Makes SecUnicodeMapFile read the file and adjust transformation to use the
right variable.

Author: victorhora

CHANGES

@@ -14,7 +14,7 @@ v3.0.3 - YYYY-MMM-DD (to be released)
  - Changes debuglogs schema to avoid unecessary str allocation
    [0xb2840 - @zimmerle]
  - Fix the SecUnicodeMapFile and SecUnicodeCodePage
-   [0x3094d - @zimmerle]
+   [0x3094d - @zimmerle, @victorhora]
  - Changes the timing to save the rule message
    [0xca270 - @zimmerle]
  - Fix crash in msc_rules_add_file() when using disruptive action in chain

headers/modsecurity/rules_properties.h

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

src/Makefile.am

@@ -279,6 +279,7 @@ libmodsecurity_la_SOURCES = \
 	rule_script.cc \
 	unique_id.cc \
 	rules_exceptions.cc \
+	rules_properties.cc \
 	${BODY_PROCESSORS} \
 	${ACTIONS} \
 	${ENGINES} \

src/actions/transformations/url_decode_uni.cc

@@ -28,7 +28,10 @@
 #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"
+
 
 namespace modsecurity {
 namespace actions {
@@ -88,8 +91,8 @@ int UrlDecodeUni::inplace(unsigned char *input, uint64_t input_len,
 
                         if (t
                             && t->m_rules->m_unicodeMapTable.m_set == true
-                            && t->m_rules->m_unicodeMapTable.m_unicode_map_table != NULL
-                            && t->m_rules->unicode_codepage > 0)  {
+                            && t->m_rules->m_unicodeMapTable.m_unicodeMapTable != NULL
+                            && t->m_rules->m_unicodeMapTable.m_unicodeCodePage > 0)  {
                             for (j = 5; j >= 2; j--) {
                                 if (isxdigit((input[i+j]))) {
                                     if (input[i+j] >= 97) {
@@ -106,7 +109,7 @@ int UrlDecodeUni::inplace(unsigned char *input, uint64_t input_len,
 
                             if (Code >= 0 && Code <= 65535)  {
                                 Rules *r = t->m_rules;
-                                hmap = r->m_unicodeMapTable.m_unicode_map_table[Code];
+                                hmap = r->m_unicodeMapTable.m_unicodeMapTable[Code];
                             }
                         }
 

src/actions/transformations/url_decode_uni.h

@@ -16,15 +16,16 @@
 #include <string>
 
 #include "modsecurity/actions/action.h"
+#include "modsecurity/rules_properties.h"
 #include "src/actions/transformations/transformation.h"
 
 #ifndef SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_UNI_H_
 #define SRC_ACTIONS_TRANSFORMATIONS_URL_DECODE_UNI_H_
 
+
 #ifdef __cplusplus
 namespace modsecurity {
 class Transaction;
-
 namespace actions {
 namespace transformations {