From 80e37df0123067aedc784321ff2c7eb2f0074030 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Wed, 27 Apr 2016 00:00:00 +0000
Subject: [PATCH] * HTTPServer.{cpp,h}: change page/cmd processing flow

---
 Daemon.cpp     |  1 +
 HTTPServer.cpp | 55 ++++++++++++++++++++++++++------------------------
 HTTPServer.h   | 10 ++++-----
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/Daemon.cpp b/Daemon.cpp
index fdb9bf3f..c98bce05 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -13,6 +13,7 @@
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "Tunnel.h"
+#include "HTTP.h"
 #include "NetDb.h"
 #include "Garlic.h"
 #include "Streaming.h"
diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index 864c9fd3..e5093bba 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -302,6 +302,11 @@ namespace http {
 			"</html>\r\n";
 	}
 
+	void ShowError(std::stringstream& s, const std::string& string)
+	{
+		s << "<b>ERROR:</b>&nbsp;" << string << "<br>\r\n";
+	}
+
 	void ShowStatus (std::stringstream& s)
 	{
 		s << "<b>Uptime:</b> ";
@@ -670,7 +675,7 @@ namespace http {
 		}
 		if (ret == 0)
 			return; /* need more data */
-		HandleRequest (request.uri);
+		HandleRequest (request);
 	}
 
 	void HTTPConnection::Terminate (const boost::system::error_code& ecode)
@@ -682,28 +687,31 @@ namespace http {
 		m_Socket->close ();
 	}
 
-	void HTTPConnection::HandleRequest (const std::string &uri)
+	void HTTPConnection::HandleRequest (const HTTPReq & req)
 	{
 		std::stringstream s;
+		std::string content;
+		HTTPRes res;
 		// Html5 head start
 		ShowPageHead (s);
-		if (uri.find("page=") != std::string::npos)
-			HandlePage (s, uri);
-		else if (uri.find("cmd=") != std::string::npos)
-			HandleCommand (s, uri);
+		if (req.uri.find("page=") != std::string::npos)
+			HandlePage (req, res, s);
+		else if (req.uri.find("cmd=") != std::string::npos)
+			HandleCommand (req, res, s);
 		else			
 			ShowStatus (s);
 		ShowPageTail (s);
-		SendReply (s.str ());
+		content = s.str ();
+		SendReply (res, content);
 	}
 
-	void HTTPConnection::HandlePage (std::stringstream& s, const std::string & uri)
+	void HTTPConnection::HandlePage (const HTTPReq& req, HTTPRes& res, std::stringstream& s)
   {
 		std::map<std::string, std::string> params;
 		std::string page("");
 		URL url;
 
-		url.parse(uri);
+		url.parse(req.uri);
 		url.parse_query(params);
 		page = params["page"];
 
@@ -727,17 +735,20 @@ namespace http {
 			ShowSAMSession (s, params["sam_id"]);
 		else if (page == HTTP_PAGE_I2P_TUNNELS)
 			ShowI2PTunnels (s);
-		else
-			SendError("Unknown page: " + page);
+		else {
+			res.code = 400;
+			ShowError(s, "Unknown page: " + page);
+			return;
+		}
   }
 
-	void HTTPConnection::HandleCommand (std::stringstream& s, const std::string & uri)
+	void HTTPConnection::HandleCommand (const HTTPReq& req, HTTPRes& res, std::stringstream& s)
 	{
 		std::map<std::string, std::string> params;
 		std::string cmd("");
 		URL url;
 
-		url.parse(uri);
+		url.parse(req.uri);
 		url.parse_query(params);
 		cmd = params["cmd"];
 
@@ -748,21 +759,20 @@ namespace http {
 		else if (cmd == HTTP_COMMAND_STOP_ACCEPTING_TUNNELS)
 			i2p::context.SetAcceptsTunnels (false);
 		else {
-			SendError("Unknown command: " + cmd);
+			res.code = 400;
+			ShowError(s, "Unknown command: " + cmd);
 			return;
 		}
-		s << "<b>Command accepted</b><br><br>\r\n";
+		s << "<b>SUCCESS</b>:&nbsp;Command accepted<br><br>\r\n";
 		s << "<a href=\"/?page=commands\">Back to commands list</a>";
 	}	
 
-	void HTTPConnection::SendReply (const std::string& content, int code)
+	void HTTPConnection::SendReply (HTTPRes& reply, std::string& content)
 	{
 		std::time_t time_now = std::time(nullptr);
 		char time_buff[128];
 		std::strftime(time_buff, sizeof(time_buff), "%a, %d %b %Y %H:%M:%S GMT", std::gmtime(&time_now));
-		HTTPRes reply;
-		reply.code = code;
-		reply.status = HTTPCodeToStatus(code);
+		reply.status = HTTPCodeToStatus(reply.code);
 		reply.headers.insert(std::pair<std::string, std::string>("Date", time_buff));
 		reply.headers.insert(std::pair<std::string, std::string>("Content-Type", "text/html"));
 		reply.headers.insert(std::pair<std::string, std::string>("Content-Length", std::to_string(content.size())));
@@ -777,13 +787,6 @@ namespace http {
 			std::bind (&HTTPConnection::Terminate, shared_from_this (), std::placeholders::_1));
 	}
 
-	void HTTPConnection::SendError(const std::string& content)
-	{
-		std::stringstream ss;
-		ss << "<html>" << itoopieImage << "<br>\r\n" << content << "</html>";
-		SendReply (ss.str(), 504);
-	}
-
 	HTTPServer::HTTPServer (const std::string& address, int port):
 		m_Thread (nullptr), m_Work (m_Service),
 		m_Acceptor (m_Service, boost::asio::ip::tcp::endpoint (boost::asio::ip::address::from_string(address), port))
diff --git a/HTTPServer.h b/HTTPServer.h
index 06fa4457..72a0c383 100644
--- a/HTTPServer.h
+++ b/HTTPServer.h
@@ -21,13 +21,11 @@ namespace http {
 			void HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
 			void Terminate     (const boost::system::error_code& ecode);
 
-			void SendReply (const std::string& content, int code = 200);
-			void SendError (const std::string& message);
-
 			void RunRequest ();
-			void HandleRequest (const std::string& uri);
-			void HandlePage    (std::stringstream& s, const std::string& request);
-			void HandleCommand (std::stringstream& s, const std::string& request);
+			void HandleRequest (const HTTPReq & req);
+			void HandlePage    (const HTTPReq & req, HTTPRes & res, std::stringstream& data);
+			void HandleCommand (const HTTPReq & req, HTTPRes & res, std::stringstream& data);
+			void SendReply     (HTTPRes & res, std::string & content);
 
 		private: