From ebb16d04394149e66f3bc8d525aaf3ce85df3001 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Fri, 17 Jul 2015 15:42:36 -0300
Subject: [PATCH] Adds support to FILES_COMBINED_SIZE variable

---
 src/request_body_processor/multipart.cc       |  3 +
 .../variable-FILES_COMBINED_SIZE.json         | 63 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 test/test-cases/regression/variable-FILES_COMBINED_SIZE.json

diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc
index 3562195d..98dee384 100644
--- a/src/request_body_processor/multipart.cc
+++ b/src/request_body_processor/multipart.cc
@@ -205,14 +205,17 @@ bool Multipart::process(std::string data) {
         start = end;
     }
 
+    double files_size = 0;
     for (std::string x : blobs) {
         MultipartBlob m(x, this);
 
         if (m.filename.empty() == false) {
             variables.emplace("FILES:" + m.name, m.filename);
             variables.emplace("FILES_NAMES:" + m.name, m.name);
+            files_size = files_size + m.content.size();
         }
     }
+    variables.emplace("FILES_COMBINED_SIZE", std::to_string(files_size));
 
     return true;
 }
diff --git a/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json b/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json
new file mode 100644
index 00000000..7932877a
--- /dev/null
+++ b/test/test-cases/regression/variable-FILES_COMBINED_SIZE.json
@@ -0,0 +1,63 @@
+[  
+  {  
+    "enabled":1,
+    "version_min":300000,
+    "title":"Testing Variables :: FILES_NAMES (1/1)",
+    "client":{  
+      "ip":"200.249.12.31",
+      "port":123
+    },
+    "server":{  
+      "ip":"200.249.12.31",
+      "port":80
+    },
+    "request":{  
+      "headers":{  
+        "Host":"localhost",
+        "User-Agent":"curl/7.38.0",
+        "Accept":"*/*",
+        "Content-Length":"330",
+        "Content-Type":"multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
+        "Expect":"100-continue"
+      },
+      "uri":"/",
+      "protocol":"POST",
+      "body":[  
+        "--------------------------756b6d74fa1a8ee2",
+        "Content-Disposition: form-data; name=\"name\"",
+        "",
+        "test",
+        "--------------------------756b6d74fa1a8ee2",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
+        "Content-Type: text/plain",
+        "",
+        "This is a very small test file..",
+        "--------------------------756b6d74fa1a8ee2",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
+        "Content-Type: text/plain",
+        "",
+        "This is another very small test file..",
+        "--------------------------756b6d74fa1a8ee2--"
+      ]
+    },
+    "response":{  
+      "headers":{  
+        "Date":"Mon, 13 Jul 2015 20:02:41 GMT",
+        "Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
+        "Content-Type":"text/html"
+      },
+      "body":[  
+        "no need."
+      ]
+    },
+    "expected":{  
+      "debug_log":"Target value: \"70.000000\" \\(Variable: FILES_COMBINED_SIZE\\)"
+    },
+    "rules":[  
+      "SecRuleEngine On",
+      "SecDebugLog \/tmp\/modsec_debug.log",
+      "SecDebugLogLevel 9",
+      "SecRule FILES_COMBINED_SIZE \"@gt 70.000000\" \"phase:3,pass,t:trim\""
+    ]
+  }
+]
\ No newline at end of file