Started rewrite of HTTPServer.

client/HTTPServer.h

@@ -6,109 +6,61 @@
 #include <memory>
 #include <boost/asio.hpp>
 #include <boost/array.hpp>
+#include "util/HTTP.h"
 
-namespace i2p
+namespace i2p {
-{
+namespace util {
-namespace util
-{
-    const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;    
-    const int HTTP_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
-    class HTTPConnection: public std::enable_shared_from_this<HTTPConnection>
-    {
-        protected:
-
-            struct header
-            {
-              std::string name;
-              std::string value;
-            };
-
-            struct request
-            {
-              std::string method;
-              std::string uri;
-              std::string host;
-              int port; 
-              int http_version_major;
-              int http_version_minor;
-              std::vector<header> headers;
-            };
-
-            struct reply
-            {
-                std::vector<header> headers;
-                std::string content;
-
-                std::vector<boost::asio::const_buffer> to_buffers (int status);
-            };
-
-        public:
-
-            HTTPConnection (boost::asio::ip::tcp::socket * socket): 
-                m_Socket (socket), m_Timer (socket->get_io_service ()), 
-                m_BufferLen (0) {};
-            ~HTTPConnection() { delete m_Socket; }
-            void Receive ();
 
-        private:
+const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;    
+const int HTTP_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
 
-            void Terminate ();
+class HTTPConnection: public std::enable_shared_from_this<HTTPConnection> {
-            void HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+public:
-            void HandleWriteReply(const boost::system::error_code& ecode);
-            void SendReply (const std::string& content, int status = 200);
-
-            void HandleRequest (const std::string& address);
-            void HandleCommand (const std::string& command, std::stringstream& s);
-            void ShowTransports (std::stringstream& s);
-            void ShowTunnels (std::stringstream& s);
-            void ShowTransitTunnels (std::stringstream& s);
-            void ShowLocalDestinations (std::stringstream& s);
-            void ShowLocalDestination (const std::string& b32, std::stringstream& s);
-            void ShowSAMSessions (std::stringstream& s);
-            void ShowSAMSession (const std::string& id, std::stringstream& s);
-            void StartAcceptingTunnels (std::stringstream& s);
-            void StopAcceptingTunnels (std::stringstream& s);
-            void FillContent (std::stringstream& s);
-            std::string ExtractAddress ();
-            void ExtractParams (const std::string& str, std::map<std::string, std::string>& params);
-            
-            
-        protected:
-
-            boost::asio::ip::tcp::socket * m_Socket;
-            boost::asio::deadline_timer m_Timer;
-            char m_Buffer[HTTP_CONNECTION_BUFFER_SIZE + 1], m_StreamBuffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
-            size_t m_BufferLen;
-            request m_Request;
-            reply m_Reply;
 
-        protected:
+    HTTPConnection(boost::asio::ip::tcp::socket * socket)
+        : m_Socket(socket), m_Timer(socket->get_io_service()), 
+        m_BufferLen(0) {};
+    ~HTTPConnection() { delete m_Socket; }
+    void Receive();
     
-            virtual void RunRequest ();
+private:
 
-        public:
+    void Terminate();
+    void HandleReceive(const boost::system::error_code& ecode, std::size_t bytes_transferred);
+    void RunRequest();
+    void HandleWriteReply(const boost::system::error_code& ecode);
+    void SendReply();
+
+    void HandleRequest();
+    void ExtractParams(const std::string& str, std::map<std::string, std::string>& params);
     
-            static const std::string itoopieImage;
+    bool isAllowed(const std::string& address);
-            static const std::string itoopieFavicon;
+private:
-    };
+    boost::asio::ip::tcp::socket* m_Socket;
+    boost::asio::deadline_timer m_Timer;
+    char m_Buffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
+    char m_StreamBuffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
+    size_t m_BufferLen;
+    util::http::Request m_Request;
+    util::http::Response m_Reply;
+};
 
-    class HTTPServer
+class HTTPServer {
-    {
+public:
-        public:
 
-            HTTPServer (const std::string& address, int port);
+    HTTPServer(const std::string& address, int port);
-            virtual ~HTTPServer ();
+    virtual ~HTTPServer();
 
-            void Start ();
+    void Start();
-            void Stop ();
+    void Stop();
 
-        private:
+private:
 
-            void Run ();
+    void Run();
-            void Accept ();
+    void Accept();
     void HandleAccept(const boost::system::error_code& ecode);
     
-        private:
+private:
 
     std::thread * m_Thread;
     boost::asio::io_service m_Service;
@@ -116,9 +68,9 @@ namespace util
     boost::asio::ip::tcp::acceptor m_Acceptor;
     boost::asio::ip::tcp::socket * m_NewSocket;
 
-        protected:
+protected:
     virtual void CreateConnection(boost::asio::ip::tcp::socket * m_NewSocket);
-    };
+};
 }
 }
 

core/util/HTTP.cpp

@@ -55,8 +55,8 @@ std::string Request::getHeader(const std::string& name) const
     return headers.at(name);
 }
 
-Response::Response(int status)
+Response::Response(int status, const std::string& content)
-    : status(status), headers()
+    : status(status), content(content), headers()
 {
 
 }
@@ -72,7 +72,7 @@ std::string Response::toString() const
     ss << "HTTP/1.1 " << status << ' ' << getStatusMessage() << "\r\n";
     for(auto& pair : headers)
         ss << pair.first << ": " << pair.second << "\r\n";
-    ss << "\r\n"; 
+    ss << "\r\n" << content; 
     return ss.str();
 }
 
@@ -99,6 +99,12 @@ std::string Response::getStatusMessage() const
             return std::string();
     }
 }
+
+void Response::setContentLength()
+{
+    setHeader("Content-Length", std::to_string(content.size()));
+}
+
 }
 }
 }

core/util/HTTP.h

@@ -14,9 +14,9 @@ class Request {
 
     void parseHeaderLine(const std::string& line);
 public:
-    Request(const std::string& data);
+    Request() = default;
 
-    Request();
+    Request(const std::string& data);
 
     std::string getMethod() const;
 
@@ -41,8 +41,9 @@ private:
 
 class Response {
 public:
+    Response() = default;
 
-    Response(int status);
+    Response(int status, const std::string& content = "");
 
     /**
      * @note overrides existing header values with the same name
@@ -57,8 +58,11 @@ public:
      */
     std::string getStatusMessage() const;
 
+    void setContentLength();
+
 private:
     int status;
+    std::string content;
     std::map<std::string, std::string> headers;
 };
 

tests/Utility.cpp

@@ -125,6 +125,7 @@ BOOST_AUTO_TEST_CASE(HTTPResponseStatusMessage)
     BOOST_CHECK_EQUAL(Response(502).getStatusMessage(), "Not Implemented");
     BOOST_CHECK_EQUAL(Response(504).getStatusMessage(), "Gateway Timeout");
 }
+
 BOOST_AUTO_TEST_CASE(WriteHTTPResponse)
 {
     Response rsp(200);
@@ -136,5 +137,16 @@ BOOST_AUTO_TEST_CASE(WriteHTTPResponse)
     );
 }
 
+BOOST_AUTO_TEST_CASE(WriteHTTPResponseWithContent)
+{
+    Response rsp(200, "Test content.");
+    rsp.setHeader("Connection", "close");
+    BOOST_CHECK_EQUAL(
+        rsp.toString(),
+        "HTTP/1.1 200 OK\r\n"
+        "Connection: close\r\n\r\n"
+        "Test content."
+    );
+}
 
 BOOST_AUTO_TEST_SUITE_END()

webui/index.html

@@ -1 +1,11 @@
-Nothing here yet.
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>Purple I2P 0.10.0 Webconsole</title>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+    <p>Nothing here yet.</p>
+</body>
+</html>