Fix and test resources managing files

etr · etr · commit faa23dd615bb · 2019-01-02T02:14:08.000Z
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -548,11 +548,11 @@ char* load_file (const char *filename)
         int size = fp.tellg();
         fp.seekg(0, fp.beg);
 
-        char* content = new char[size];
+        char* content = new char[size + 1];
         fp.read(content, size);
         fp.close();
 
-        content[size - 1] = 0;
+        content[size] = '\0';
         return content;
     }
     else
diff --git a/test/integ/basic.cpp b/test/integ/basic.cpp
@@ -178,6 +178,15 @@ class no_response_resource : public http_resource
         }
 };
 
+class file_response_resource : public http_resource
+{
+    public:
+        const http_response render_GET(const http_request& req)
+        {
+            return http_response_builder("test_content", 200, "text/plain").file_response();
+        }
+};
+
 LT_BEGIN_SUITE(basic_suite)
 
     webserver* ws;
@@ -697,6 +706,24 @@ LT_BEGIN_AUTO_TEST(basic_suite, register_unregister)
     }
 LT_END_AUTO_TEST(register_unregister)
 
+LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource)
+    file_response_resource* resource = new file_response_resource();
+    ws->register_resource("base", resource);
+    curl_global_init(CURL_GLOBAL_ALL);
+
+    std::string s;
+    CURL *curl = curl_easy_init();
+    CURLcode res;
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    LT_CHECK_EQ(s, "test content of file\n");
+    curl_easy_cleanup(curl);
+LT_END_AUTO_TEST(file_serving_resource)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
@@ -496,7 +496,7 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, ip_representation6_sockaddr)
 LT_END_AUTO_TEST(ip_representation6_sockaddr)
 
 LT_BEGIN_AUTO_TEST(http_utils_suite, load_file)
-    LT_CHECK_EQ(std::string(http::load_file("test_content")), "test content of file");
+    LT_CHECK_EQ(std::string(http::load_file("test_content")), "test content of file\n");
 LT_END_AUTO_TEST(load_file)
 
 LT_BEGIN_AUTO_TEST(http_utils_suite, load_file_invalid)
