Fix semantic of the single_resource option

etr · etr · commit a8c83343f4bb · 2019-01-03T00:03:18.000Z
diff --git a/src/httpserver/create_webserver.hpp b/src/httpserver/create_webserver.hpp
@@ -80,7 +80,7 @@ class create_webserver
             _ban_system_enabled(true),
             _post_process_enabled(true),
             _comet_enabled(false),
-            _single_resource(0x0),
+            _single_resource(false),
             _not_found_resource(0x0),
             _method_not_allowed_resource(0x0),
             _method_not_acceptable_resource(0x0),
@@ -122,7 +122,7 @@ class create_webserver
             _ban_system_enabled(true),
             _post_process_enabled(true),
             _comet_enabled(false),
-            _single_resource(0x0),
+            _single_resource(false),
             _not_found_resource(0x0),
             _method_not_allowed_resource(0x0),
             _method_not_acceptable_resource(0x0),
@@ -304,9 +304,9 @@ class create_webserver
         {
             _post_process_enabled = false; return *this;
         }
-        create_webserver& single_resource(render_ptr single_resource)
+        create_webserver& single_resource()
         {
-            _single_resource = single_resource; return *this;
+            _single_resource = true; return *this;
         }
         create_webserver& not_found_resource(render_ptr not_found_resource)
         {
@@ -367,7 +367,7 @@ class create_webserver
         bool _ban_system_enabled;
         bool _post_process_enabled;
         bool _comet_enabled;
-        render_ptr _single_resource;
+        bool _single_resource;
         render_ptr _not_found_resource;
         render_ptr _method_not_allowed_resource;
         render_ptr _method_not_acceptable_resource;
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -180,10 +180,6 @@ webserver::webserver(const create_webserver& params):
     next_to_choose(0),
     internal_comet_manager(new details::comet_manager())
 {
-    if(single_resource != 0x0)
-        this->single_resource = true;
-    else
-        this->single_resource = false;
     ignore_sigpipe();
     pthread_mutex_init(&mutexwait, NULL);
     pthread_rwlock_init(&runguard, NULL);
@@ -222,6 +218,11 @@ void webserver::request_completed (
 
 bool webserver::register_resource(const std::string& resource, http_resource* hrm, bool family)
 {
+    if (single_resource && ((resource != "" && resource != "/") || !family))
+    {
+        throw std::invalid_argument("The resource should be '' or '/' and be marked as family when using a single_resource server");
+    }
+
     details::http_endpoint idx(resource, family, true, regex_checking);
 
     pair<map<details::http_endpoint, http_resource*>::iterator, bool> result = registered_resources.insert(
diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
@@ -260,6 +260,38 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_socket)
     ws.stop();
 LT_END_AUTO_TEST(custom_socket)
 
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, single_resource)
+    webserver ws = create_webserver(8080).single_resource();
+    ok_resource* ok = new ok_resource();
+    ws.register_resource("/", ok, true);
+    ws.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL *curl = curl_easy_init();
+    CURLcode res;
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/any/url/works");
+    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, "OK");
+    curl_easy_cleanup(curl);
+
+    ws.stop();
+LT_END_AUTO_TEST(single_resource)
+
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, single_resource_not_default_resource)
+    webserver ws = create_webserver(8080).single_resource();
+    ok_resource* ok = new ok_resource();
+    LT_CHECK_THROW(ws.register_resource("/other", ok, true));
+    LT_CHECK_THROW(ws.register_resource("/", ok, false));
+    ws.start(false);
+
+    ws.stop();
+LT_END_AUTO_TEST(single_resource_not_default_resource)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
