Update content-length in regeression_tests format subcommand

when UPDATE_CONTENT_LENGTH env var is set

Author: hnakamur

test/common/modsecurity_test.cc

@@ -151,6 +151,9 @@ void ModSecurityTest<T>::cmd_options(int argc, char **argv) {
         i++;
         m_format = true;
     }
+    if (std::getenv("UPDATE_CONTENT_LENGTH")) {
+        m_update_content_length = true;
+    }
     if (std::getenv("AUTOMAKE_TESTS")) {
         m_automake_output = true;
     }

test/common/modsecurity_test.h

@@ -36,7 +36,8 @@ template <class T> class ModSecurityTest :
         m_automake_output(false),
         m_count_all(false),
         m_test_multithreaded(false),
-        m_format{false} { }
+        m_format{false},
+        m_update_content_length{false} { }
 
     std::string header();
     void cmd_options(int, char **);
@@ -52,6 +53,7 @@ template <class T> class ModSecurityTest :
     bool m_count_all;
     bool m_test_multithreaded;
     bool m_format;
+    bool m_update_content_length;
 };
 
 }  // namespace modsecurity_test

test/regression/regression.cc

@@ -450,6 +450,9 @@ int main(int argc, char **argv)
                 std::cerr << "cannot open " << name << " for writing." << std::endl;
                 return 1;
             }
+            if (test.m_update_content_length) {
+                tests[0]->update_content_lengths();
+            }
             ofs << tests[0]->toJSON();
             ofs.close();
             std::cout << "written formatted JSON to " << name << std::endl;

test/regression/regression_test.cc

@@ -20,6 +20,7 @@
 #include <sstream>
 #include <unordered_map>
 #include <string>
+#include <algorithm>
 
 #ifdef WITH_YAJL
 #include <yajl/yajl_gen.h>
@@ -225,6 +226,49 @@ RegressionTest *RegressionTest::from_yajl_node(const yajl_val &node) {
     return u;
 }
 
+constexpr char ascii_tolower(char c) {
+    return 'A' <= c && c <= 'Z' ? (c + ('a' - 'A')) : c;
+}
+
+bool iequals_ascii(std::string_view a, std::string_view b) {
+    return a.size() == b.size() &&
+        std::equal(a.begin(), a.end(), b.begin(), b.end(),
+            [](char x, char y) {
+                return ascii_tolower(x) == ascii_tolower(y);
+            });
+}
+
+static bool has_chunked_header(const std::vector<std::pair<std::string, std::string>> &headers) {
+    for (const auto &header : headers) {
+        if (iequals_ascii(header.first, "Transfer-Encoding") && iequals_ascii(header.second, "chunked")) {
+            return true;
+        }
+    }
+    return false;
+}
+
+static void update_content_length(std::vector<std::pair<std::string, std::string>> &headers, size_t length) {
+    if (has_chunked_header(headers)) {
+        return;
+    }
+
+    bool has_content_length = false;
+    for (auto &header : headers) {
+        if (iequals_ascii(header.first, "Content-Length")) {
+            header.second = std::to_string(length);
+            has_content_length = true;
+        }
+    }
+    if (!has_content_length) {
+        headers.push_back(std::pair{"Content-Length", std::to_string(length)});
+    }
+}
+
+void RegressionTest::update_content_lengths() {
+    update_content_length(request_headers, request_body.size());
+    update_content_length(response_headers, response_body.size());
+}
+
 RegressionTests *RegressionTests::from_yajl_node(const yajl_val &node) {
     RegressionTests *u = new RegressionTests();
     size_t num_tests = node->u.array.len;
@@ -235,6 +279,12 @@ RegressionTests *RegressionTests::from_yajl_node(const yajl_val &node) {
     return u;
 }
 
+void RegressionTests::update_content_lengths() {
+    for (auto & test : tests) {
+        test.update_content_lengths();
+    }
+}
+
 #ifdef WITH_YAJL
 
 static yajl_gen_status gen_string_view(yajl_gen g, std::string_view s) {

test/regression/regression_test.h

@@ -83,11 +83,13 @@ class RegressionTest {
     std::vector<std::string> request_body_lines;
     std::vector<std::string> response_body_lines;
     std::vector<std::string> rules_lines;
+    void update_content_lengths();
 };
 
 class RegressionTests {
  public:
     static RegressionTests *from_yajl_node(const yajl_val &);
+    void update_content_lengths();
     std::string toJSON();
 
     std::string filename;