Introduced file_not_found management in file_responses.

Sebastiano Merlino · Sebastiano Merlino · commit 754a09256f70 · 2012-11-17T22:18:23.000+01:00
Enhanced response exceptions management.
diff --git a/src/http_response.cpp b/src/http_response.cpp
@@ -149,7 +149,8 @@ void http_file_response::get_raw_response(MHD_Response** response, webserver* ws
     size_t size = http::load_file(filename.c_str(), &page);
     if(size)
         *response = MHD_create_response_from_buffer(size, page, MHD_RESPMEM_MUST_FREE);
-    //TODO: At the moment if the file does not exist the system returns empty response
+    else
+        *response = MHD_create_response_from_buffer(size, (void*) "", MHD_RESPMEM_PERSISTENT);
 }
 
 void cache_response::get_raw_response(MHD_Response** response, webserver* ws)
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -437,7 +437,8 @@ size_t load_file (const char* filename, char** content)
         fp.close();
         return size;
     }
-    return 0;
+    else
+        throw file_access_exception();
 }
 
 char* load_file (const char *filename)
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -48,6 +48,14 @@ class bad_ip_format_exception: public std::exception
     }
 };
 
+class file_access_exception: public std::exception
+{
+    virtual const char* what() const throw()
+    {
+        return "Unable to open file!";
+    }
+}; 
+
 class http_utils 
 {
     public:
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -363,7 +363,7 @@ class webserver
         void clean_connections();
 
         void method_not_allowed_page(http_response** dhrs, details::modded_request* mr);
-        void internal_error_page(http_response** dhrs, details::modded_request* mr);
+        void internal_error_page(http_response** dhrs, details::modded_request* mr, bool force_our = false);
         void not_found_page(http_response** dhrs, details::modded_request* mr);
 
         static int method_not_acceptable_page 
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -1063,9 +1063,9 @@ void webserver::method_not_allowed_page(http_response** dhrs, details::modded_re
         *dhrs = new http_string_response(METHOD_ERROR, http_utils::http_method_not_allowed);
 }
 
-void webserver::internal_error_page(http_response** dhrs, details::modded_request* mr)
+void webserver::internal_error_page(http_response** dhrs, details::modded_request* mr, bool force_our)
 {
-    if(internal_error_resource != 0x0)
+    if(internal_error_resource != 0x0 || !force_our)
         ((internal_error_resource)->*(mr->callback))(*mr->dhr, dhrs);
     else
         *dhrs = new http_string_response(GENERIC_ERROR, http_utils::http_internal_server_error);
@@ -1271,7 +1271,32 @@ int webserver::finalize_answer(MHD_Connection* connection, struct details::modde
 #endif //WITH_PYTHON
     mr->dhrs = dhrs;
     mr->dhrs->underlying_connection = connection;
-    dhrs->get_raw_response(&raw_response, this);
+    try
+    {
+        try
+        {
+            dhrs->get_raw_response(&raw_response, this);
+        }
+        catch(const file_access_exception& fae)
+        {
+            not_found_page(&dhrs, mr);
+            dhrs->get_raw_response(&raw_response, this);
+        }
+        catch(const std::exception& e)
+        {
+            internal_error_page(&dhrs, mr);
+            dhrs->get_raw_response(&raw_response, this);
+        }
+        catch(...)
+        {
+            internal_error_page(&dhrs, mr);
+            dhrs->get_raw_response(&raw_response, this);
+        }
+    }
+    catch(...)
+    {
+        internal_error_page(&dhrs, mr, true);
+    }
     dhrs->decorate_response(raw_response);
     to_ret = dhrs->enqueue_response(connection, raw_response);
     MHD_destroy_response (raw_response);

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ void http_file_response::get_raw_response(MHD_Response** response, webserver* ws`
`149`	`149`	`size_t size = http::load_file(filename.c_str(), &page);`
`150`	`150`	`if(size)`
`151`	`151`	`*response = MHD_create_response_from_buffer(size, page, MHD_RESPMEM_MUST_FREE);`
`152`		`- //TODO: At the moment if the file does not exist the system returns empty response`
	`152`	`+ else`
	`153`	`+ response = MHD_create_response_from_buffer(size, (void) "", MHD_RESPMEM_PERSISTENT);`
`153`	`154`	`}`
`154`	`155`
`155`	`156`	`void cache_response::get_raw_response(MHD_Response** response, webserver* ws)`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,8 @@ size_t load_file (const char* filename, char** content)`
`437`	`437`	`fp.close();`
`438`	`438`	`return size;`
`439`	`439`	`}`
`440`		`- return 0;`
	`440`	`+ else`
	`441`	`+ throw file_access_exception();`
`441`	`442`	`}`
`442`	`443`
`443`	`444`	`char* load_file (const char *filename)`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,14 @@ class bad_ip_format_exception: public std::exception`
`48`	`48`	`}`
`49`	`49`	`};`
`50`	`50`
	`51`	`+class file_access_exception: public std::exception`
	`52`	`+{`
	`53`	`+ virtual const char* what() const throw()`
	`54`	`+ {`
	`55`	`+ return "Unable to open file!";`
	`56`	`+ }`
	`57`	`+};`
	`58`	`+`
`51`	`59`	`class http_utils`
`52`	`60`	`{`
`53`	`61`	`public:`