Merge commit from fork

Fix utf8toUnicode string truncate issue on i386

Author: airween

src/actions/transformations/utf8_to_unicode.cc

@@ -34,7 +34,9 @@ static inline bool encode(std::string &value) {
     bool changed = false;
     std::string::size_type count = 0;
     auto bytes_left = input_len;
-    unsigned char unicode[8];
+    char unicode[8] = {0}; /* 5 or 6 bytes for OLD standard unicode character and 1 byte for null terminator */
+                           /* 4 bytes are enough for standard UTF8 + '\0' */
+                           /* result can be only signed char array, so no need to cast later */
 
     /* RFC3629 states that UTF-8 are encoded using sequences of 1 to 4 octets. */
     /* Max size per character should fit in 4 bytes */
@@ -81,10 +83,7 @@ static inline bool encode(std::string &value) {
                     d = ((c & 0x1F) << 6) | (*(utf + 1) & 0x3F);
                     *data++ = '%';
                     *data++ = 'u';
-                    snprintf(reinterpret_cast<char *>(unicode),
-                             sizeof(reinterpret_cast<char *>(unicode)),
-                             "%x", d);
-                    length = strlen(reinterpret_cast<char *>(unicode));
+                    length = snprintf(unicode, sizeof(unicode), "%x", d);
 
                     switch (length) {
                         case 1:
@@ -104,7 +103,7 @@ static inline bool encode(std::string &value) {
                             break;
                     }
 
-                    for (std::string::size_type j = 0; j < length; j++) {
+                    for (int j = 0; j < length; j++) {
                         *data++ = unicode[j];
                     }
 
@@ -133,10 +132,7 @@ static inline bool encode(std::string &value) {
                         | (*(utf + 2) & 0x3F);
                     *data++ = '%';
                     *data++ = 'u';
-                    snprintf(reinterpret_cast<char *>(unicode),
-                             sizeof(reinterpret_cast<char *>(unicode)),
-                             "%x", d);
-                    length = strlen(reinterpret_cast<char *>(unicode));
+                    length = snprintf(unicode, sizeof(unicode), "%x", d);
 
                     switch (length)  {
                         case 1:
@@ -156,7 +152,7 @@ static inline bool encode(std::string &value) {
                             break;
                     }
 
-                    for (std::string::size_type j = 0; j < length; j++) {
+                    for (int j = 0; j < length; j++) {
                         *data++ = unicode[j];
                     }
 
@@ -195,10 +191,7 @@ static inline bool encode(std::string &value) {
                         | (*(utf + 3) & 0x3F);
                     *data++ = '%';
                     *data++ = 'u';
-                    snprintf(reinterpret_cast<char *>(unicode),
-                             sizeof(reinterpret_cast<char *>(unicode)),
-                             "%x", d);
-                    length = strlen(reinterpret_cast<char *>(unicode));
+                    length = snprintf(unicode, sizeof(unicode), "%x", d);
 
                     switch (length)  {
                         case 1:
@@ -218,7 +211,7 @@ static inline bool encode(std::string &value) {
                             break;
                     }
 
-                    for (std::string::size_type j = 0; j < length; j++) {
+                    for (int j = 0; j < length; j++) {
                         *data++ = unicode[j];
                     }
 

test/test-cases/regression/transformations.json

@@ -118,5 +118,55 @@
       "SecRuleEngine On",
       "SecRule ARGS \"@contains test \" \"id:1,pass,t:trim,t:lowercase\""
     ]
+  },
+  {
+    "enabled": 1,
+    "version_min": 300000,
+    "version_max": 0,
+    "title": "Testing transformations :: none,utf8toUnicode,urlDecodeUni,htmlEntityDecode,jsDecode,cssDecode,removeNulls",
+    "client": {
+      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
+      "headers": {
+        "Host": "www.modsecurity.org",
+        "User-Agent": "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5 (.NET CLR 3.5.30729)",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "Accept-Language": "en-us,en;q=0.5",
+        "Accept-Encoding": "gzip,deflate",
+        "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.7",
+        "Keep-Alive": "300",
+        "Connection": "keep-alive",
+        "Pragma": "no-cache",
+        "Cache-Control": "no-cache",
+        "Content-Length": "0"
+      },
+      "uri": "/?var=%ef%bc%9cscript%20%ef%bc%9ealert%281%29%ef%bc%9c/script%ef%bc%9e",
+      "method": "GET",
+      "http_version": 1.1,
+      "body": [
+        ""
+      ]
+    },
+    "response": {
+      "headers": {
+        "Content-Length": "0"
+      },
+      "body": [
+        ""
+      ]
+    },
+    "expected": {
+      "http_code": 403
+    },
+    "rules": [
+      "SecRuleEngine On",
+      "SecRule ARGS \"@rx (?i)<script[^>]*>[\\s\\S]*?\" \"id:941110,phase:2,deny,capture,t:none,t:utf8toUnicode,t:urlDecodeUni,t:htmlEntityDecode,t:jsDecode,t:cssDecode,t:removeNulls\""
+    ]
   }
 ]