Used strategy pattern also for header setting and response enqueuing

Sebastiano Merlino · Sebastiano Merlino · commit 7068ba646932 · 2012-11-05T10:46:22.000+01:00
diff --git a/src/http_response.cpp b/src/http_response.cpp
@@ -94,6 +94,30 @@ void http_response::get_raw_response(MHD_Response** response, bool* found, webse
     *response = MHD_create_response_from_buffer(size, (void*) content.c_str(), MHD_RESPMEM_PERSISTENT);
 }
 
+void http_response::decorate_response(MHD_Response* response)
+{
+    map<string, string, header_comparator>::iterator it;
+    for (it=headers.begin() ; it != headers.end(); ++it)
+        MHD_add_response_header(response, (*it).first.c_str(), (*it).second.c_str());
+    for (it=footers.begin() ; it != footers.end(); ++it)
+        MHD_add_response_footer(response, (*it).first.c_str(), (*it).second.c_str());
+}
+
+int http_response::enqueue_response(MHD_Connection* connection, MHD_Response* response)
+{
+    return MHD_queue_response(connection, response_code, response);
+}
+
+int http_basic_auth_fail_response::enqueue_response(MHD_Connection* connection, MHD_Response* response)
+{
+    return MHD_queue_basic_auth_fail_response(connection, realm.c_str(), response);
+}
+
+int http_digest_auth_fail_response::enqueue_response(MHD_Connection* connection, MHD_Response* response)
+{
+    return MHD_queue_auth_fail_response(connection, realm.c_str(), opaque.c_str(), response, reload_nonce ? MHD_YES : MHD_NO);
+}
+
 void http_file_response::get_raw_response(MHD_Response** response, bool* found, webserver* ws)
 {
     char* page = NULL;
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
@@ -318,6 +318,8 @@ class http_response
         struct MHD_Connection* underlying_connection;
 
         virtual void get_raw_response(MHD_Response** res, bool* found, webserver* ws = 0x0);
+        virtual void decorate_response(MHD_Response* res);
+        virtual int enqueue_response(MHD_Connection* connection, MHD_Response* res);
 
         friend class webserver;
         friend void clone_response(const http_response& hr, http_response** dhr);
@@ -383,6 +385,8 @@ class http_basic_auth_fail_response : public http_response
         ) : http_response(http_response::BASIC_AUTH_FAIL, content, response_code, content_type, autodelete, realm) { }
 
         http_basic_auth_fail_response(const http_response& b) : http_response(b) { }
+    protected:
+        virtual int enqueue_response(MHD_Connection* connection, MHD_Response* res);
 };
 
 class http_digest_auth_fail_response : public http_response
@@ -402,6 +406,8 @@ class http_digest_auth_fail_response : public http_response
         }
 
         http_digest_auth_fail_response(const http_response& b) : http_response(b) { }
+    protected:
+        virtual int enqueue_response(MHD_Connection* connection, MHD_Response* res);
 };
 
 class shoutCAST_response : public http_response
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -1050,21 +1050,8 @@ int webserver::finalize_answer(MHD_Connection* connection, struct modded_request
     mr->dhrs = dhrs;
     mr->dhrs->underlying_connection = connection;
     dhrs->get_raw_response(&response, &found, this);
-    vector<pair<string,string> > response_headers;
-    dhrs->get_headers(response_headers);
-    vector<pair<string,string> > response_footers;
-    dhrs->get_footers(response_footers);
-    vector<pair<string,string> >::iterator it;
-    for (it=response_headers.begin() ; it != response_headers.end(); ++it)
-        MHD_add_response_header(response, (*it).first.c_str(), (*it).second.c_str());
-    for (it=response_footers.begin() ; it != response_footers.end(); ++it)
-        MHD_add_response_footer(response, (*it).first.c_str(), (*it).second.c_str());
-    if(dhrs->response_type == http_response::DIGEST_AUTH_FAIL)
-        to_ret = MHD_queue_auth_fail_response(connection, dhrs->get_realm().c_str(), dhrs->get_opaque().c_str(), response, dhrs->need_nonce_reload() ? MHD_YES : MHD_NO);
-    else if(dhrs->response_type == http_response::BASIC_AUTH_FAIL)
-        to_ret = MHD_queue_basic_auth_fail_response(connection, dhrs->get_realm().c_str(), response);
-    else
-        to_ret = MHD_queue_response(connection, dhrs->get_response_code(), response);
+    dhrs->decorate_response(response);
+    to_ret = dhrs->enqueue_response(connection, response);
     MHD_destroy_response (response);
     return to_ret;
 }
