Add operator<<() to http_request and http_response

Chris Love · Chris Love · commit bd184f1d5377 · 2014-08-30T16:06:01.000-07:00
diff --git a/examples/service.cpp b/examples/service.cpp
@@ -1,6 +1,6 @@
 /*
      This file is part of libhttpserver
-     Copyright (C) 2014 Chris Love
+     Copyright (C) 2014 Sebastiano Merlino
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,8 @@
 
 using namespace httpserver;
 
+bool verbose=false;
+
 class service_resource: public http_resource<service_resource> {
 public:
 	service_resource();
@@ -63,7 +65,11 @@ service_resource::render_GET(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_GET()" << std::endl;
 
-	*res = new http_response(http_response_builder("GET response", 200).string_response());	
+    if (verbose) std::cout << req;
+
+	*res = new http_response(http_response_builder("GET response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
 }
 
 
@@ -72,7 +78,11 @@ service_resource::render_PUT(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_PUT()" << std::endl;	
 
-	*res = new http_response(http_response_builder("PUT response", 200).string_response());		
+    if (verbose) std::cout << req;
+    
+	*res = new http_response(http_response_builder("PUT response", 200).string_response());
+
+    if (verbose) std::cout << **res;
 }
 
 
@@ -81,14 +91,22 @@ service_resource::render_POST(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_POST()" << std::endl;	
 
-	*res = new http_response(http_response_builder("POST response", 200).string_response());		
+    if (verbose) std::cout << req;
+    
+	*res = new http_response(http_response_builder("POST response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
 }
 void
 service_resource::render(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render()" << std::endl;	
 
-	*res = new http_response(http_response_builder("generic response", 200).string_response());	
+    if (verbose) std::cout << req;
+
+	*res = new http_response(http_response_builder("generic response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
 }
 
 
@@ -97,31 +115,53 @@ service_resource::render_HEAD(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_HEAD()" << std::endl;
 
-	*res = new http_response(http_response_builder("HEAD response", 200).string_response());		
+    if (verbose) std::cout << req;
+    
+	*res = new http_response(http_response_builder("HEAD response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
 }
 
 void
 service_resource::render_OPTIONS(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_OPTIONS()" << std::endl;
 
-	*res = new http_response(http_response_builder("OPTIONS response", 200).string_response());		
+    if (verbose) std::cout << req;
+    
+	*res = new http_response(http_response_builder("OPTIONS response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
 }
 
 void
 service_resource::render_CONNECT(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_CONNECT()" << std::endl;	
 
-	*res = new http_response(http_response_builder("CONNECT response", 200).string_response());			
+    if (verbose) std::cout << req;
+    
+	*res = new http_response(http_response_builder("CONNECT response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
 }
 
 void
 service_resource::render_DELETE(const http_request &req, http_response** res)
 {
 	std::cout << "service_resource::render_DELETE()" << std::endl;	
 
-	*res = new http_response(http_response_builder("DELETE response", 200).string_response());			
+    if (verbose) std::cout << req;
+    
+	*res = new http_response(http_response_builder("DELETE response", 200).string_response());
+
+    if (verbose) std::cout << **res;    
+}
+
+void usage()
+{
+    std::cout << "Usage:" << std::endl
+              << "service [-p <port>][-s [-k <keyFileName>][-c <certFileName>]][-v]" << std::endl;
 }
 
 int main(int argc, char **argv)
@@ -132,7 +172,7 @@ int main(int argc, char **argv)
     const char *cert="cert.pem";
     bool secure=false;
 
-	while ((c = getopt(argc,argv,"p:k:c:s")) != EOF) {
+	while ((c = getopt(argc,argv,"p:k:c:sv?")) != EOF) {
 		switch (c) {
 		case 'p':
 			port=strtoul(optarg,NULL,10);
@@ -145,8 +185,13 @@ int main(int argc, char **argv)
             break;
         case 's':
             secure=true;
+            break;
+        case 'v':
+            verbose=true;
             break;
 		default:
+            usage();
+            exit(1);
 			break;
 		}
 	}
diff --git a/src/http_request.cpp b/src/http_request.cpp
@@ -22,6 +22,7 @@
 #include "http_utils.hpp"
 #include "http_request.hpp"
 #include "string_utilities.hpp"
+#include <iostream>
 
 using namespace std;
 
@@ -85,4 +86,21 @@ size_t http_request::get_args(std::map<std::string, std::string, arg_comparator>
     return result.size();
 }
 
-};
+std::ostream &operator<< (std::ostream &os, const http_request &r)
+{
+    os << r.method << " Request [user:\"" << r.user << "\" pass:\"" << r.pass << "\"] path:\""
+       << r.path << "\"" << std::endl;
+
+    http::dump_header_map(os,"Headers",r.headers);
+    http::dump_header_map(os,"Footers",r.footers);
+    http::dump_header_map(os,"Cookies",r.cookies);
+    http::dump_arg_map(os,"Query Args",r.args);
+
+    os << "    Version [ " << r.version << " ] Requestor [ " << r.requestor
+       << " ] Port [ " << r.requestor_port << " ]" << std::endl;
+
+    return os;
+}
+    
+
+}
diff --git a/src/http_response.cpp b/src/http_response.cpp
@@ -289,4 +289,16 @@ void http_response::get_raw_response_lp_send(
     ws->send_message_to_topic(send_topic, content);
 }
 
+std::ostream &operator<< (std::ostream &os, const http_response &r)
+{
+    os << "Response [response_code:" << r.response_code << "]" << std::endl;
+
+    http::dump_header_map(os,"Headers",r.headers);
+    http::dump_header_map(os,"Footers",r.footers);
+    http::dump_header_map(os,"Cookies",r.cookies);
+
+    return os;
+}
+
+    
 };
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -33,6 +33,7 @@
 #include <sstream>
 #include <iomanip>
 #include <fstream>
+#include <iostream>
 #include "string_utilities.hpp"
 #include "http_utils.hpp"
 
@@ -541,5 +542,36 @@ char* load_file (const char *filename)
     return content;
 }
 
+void dump_header_map(std::ostream &os, const std::string &prefix,
+                     const std::map<std::string,std::string,header_comparator> &map)
+{
+    std::map<std::string,std::string,header_comparator>::const_iterator it = map.begin(); 
+    std::map<std::string,std::string,header_comparator>::const_iterator end = map.end();
+
+    if (map.size()) {
+        os << "    " << prefix << " [";
+        for (; it != end; ++it) {
+            os << (*it).first << ":\"" << (*it).second << "\" ";
+        }
+        os << "]" << std::endl;
+    }
+}
+
+void dump_arg_map(std::ostream &os, const std::string &prefix,
+                  const std::map<std::string,std::string,arg_comparator> &map)
+{
+    std::map<std::string,std::string,arg_comparator>::const_iterator it = map.begin(); 
+    std::map<std::string,std::string,arg_comparator>::const_iterator end = map.end();
+
+    if (map.size()) {
+        os << "    " << prefix << " [";
+        for (; it != end; ++it) {
+            os << (*it).first << ":\"" << (*it).second << "\" ";
+        }
+        os << "]" << std::endl;
+    }
+}
+    
+    
 };
 };
diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
@@ -29,6 +29,7 @@
 #include <vector>
 #include <string>
 #include <utility>
+#include <iosfwd>
 
 struct MHD_Connection;
 
@@ -355,6 +356,8 @@ class http_request
                 const std::string& password,
                 int nonce_timeout, bool& reload_nonce
         ) const;
+
+		friend std::ostream &operator<< (std::ostream &os, const http_request &r);    
     private:
         /**
          * Default constructor of the class. It is a specific responsibility of apis to initialize this type of objects.
@@ -585,5 +588,7 @@ class http_request
         friend class webserver;
 };
 
+std::ostream &operator<< (std::ostream &os, const http_request &r);
+
 };
 #endif
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
@@ -27,6 +27,7 @@
 #include <map>
 #include <utility>
 #include <string>
+#include <iosfwd>
 
 #include "httpserver/details/http_resource_mirror.hpp"
 
@@ -69,6 +70,7 @@ typedef ssize_t(*cycle_callback_ptr)(const std::string&);
 class http_response
 {
     public:
+    
         http_response(const http_response_builder& builder);
 
         /**
@@ -296,11 +298,14 @@ class http_response
         friend class http_response_builder;
         friend void clone_response(const http_response& hr, http_response** dhr);
         friend ssize_t details::cb(void* cls, uint64_t pos, char* buf, size_t max);
+    	friend std::ostream &operator<< (std::ostream &os, const http_response &r);    
     private:
         http_response& operator=(const http_response& b);
 
         static ssize_t data_generator (void* cls, uint64_t pos, char* buf, size_t max);
 };
 
+std::ostream &operator<< (std::ostream &os, const http_response &r);    
+
 };
 #endif
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -29,8 +29,10 @@
 #include <string>
 #include <cctype>
 #include <vector>
+#include <map>
 #include <algorithm>
 #include <exception>
+#include <iosfwd>
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #endif
@@ -327,6 +329,25 @@ std::string get_ip_str_new(const struct sockaddr* sa,
  * @return short representing the port
 **/
 short get_port(const struct sockaddr* sa);
+
+/**
+ * Method to output the contents of a headers map to a std::ostream
+ * @param os The ostream
+ * @param prefix Prefix to identify the map
+ * @param map
+**/
+void dump_header_map(std::ostream &os, const std::string &prefix,
+                     const std::map<std::string,std::string,header_comparator> &map);
+
+/**
+ * Method to output the contents of an arguments map to a std::ostream
+ * @param os The ostream
+ * @param prefix Prefix to identify the map
+ * @param map
+**/
+void dump_arg_map(std::ostream &os, const std::string &prefix,
+                     const std::map<std::string,std::string,arg_comparator> &map);
+    
 /**
  * Process escape sequences ('+'=space, %HH) Updates val in place; the
  * result should be UTF-8 encoded and cannot be larger than the input.
