Add HTTPS echo server sample

Author: auscaster

src/http/include/scy/http/connection.h

@@ -72,6 +72,9 @@ class HTTP_API Connection : public net::SocketAdapter
     /// The flow is: Connection <-> ConnectionAdapter <-> Socket
     virtual void replaceAdapter(net::SocketAdapter* adapter);
 
+    /// Return true if the connection uses TLS/SSL.
+    bool secure() const;
+
     /// Return the underlying socket pointer.
     net::TCPSocket::Ptr& socket();
 

src/http/include/scy/http/message.h

@@ -55,17 +55,15 @@ class HTTP_API Message : public NVCollection
     /// or CHUNKED_TRANSFER_CODING.
     void setTransferEncoding(const std::string& transferEncoding);
 
-    /// Returns the transfer encoding used for this
-    /// message.
+    /// Returns the transfer encoding used for this message.
     ///
     /// Normally, this is the value of the Transfer-Encoding
     /// header field. If no such field is present,
     /// returns IDENTITY_TRANSFER_CODING.
     const std::string& getTransferEncoding() const;
 
     /// If flag is true, sets the Transfer-Encoding header to
-    /// chunked. Otherwise, removes the Transfer-Encoding
-    /// header.
+    /// chunked. Otherwise, removes the Transfer-Encoding header.
     void setChunkedTransferEncoding(bool flag);
 
     /// Returns true if the Transfer-Encoding header is set
@@ -91,8 +89,7 @@ class HTTP_API Message : public NVCollection
     void setKeepAlive(bool keepAlive);
 
     /// Returns true if
-    ///   * the message has a Connection header field and its value is
-    ///   "Keep-Alive"
+    ///   * the message has a Connection header field and its value is "Keep-Alive"
     ///   * the message is a HTTP/1.1 message and not Connection header is set
     /// Returns false otherwise.
     bool getKeepAlive() const;
@@ -129,7 +126,7 @@ class HTTP_API Message : public NVCollection
 
 protected:
     std::string _version;
-    
+
     /// Creates the Message with version HTTP/1.0.
     Message();
 

src/http/include/scy/http/server.h

@@ -110,10 +110,6 @@ class HTTP_API ServerResponder
 };
 
 
-
-// -------------------------------------------------------------------
-//
-
 /// This implementation of a ServerConnectionFactory
 /// is used by HTTP Server to create ServerConnection objects.
 class HTTP_API ServerConnectionFactory
@@ -138,9 +134,6 @@ class HTTP_API ServerConnectionFactory
 };
 
 
-// -------------------------------------------------------------------
-//
-
 /// HTTP server implementation.
 ///
 /// This HTTP server is not strictly standards compliant.

src/http/samples/httpechoserver/httpechoserver.cpp

@@ -17,22 +17,23 @@ int main(int argc, char** argv)
     setenv("UV_THREADPOOL_SIZE", std::to_string(ncores).c_str(), 1);
 #endif
 
+    net::SSLManager::initNoVerifyServer();
+
     // Logger::instance().add(new ConsoleChannel("debug", Level::Trace));
     // Logger::instance().setWriter(new AsyncLogWriter);
-    // net::SSLManager::initNoVerifyServer();
-    {
-        raiseBenchmarkServer();
-        // runMulticoreBenchmarkServers();
-        // runMulticoreEchoServers();
-        // rlibuv::raiseBenchmarkServer();
-
+//
 // #if SCY_HAS_KERNEL_SOCKET_LOAD_BALANCING
-        // runMulticoreBenchmarkServers();
+    // runMulticoreBenchmarkServers();
 // #else
-        // raiseBenchmarkServer();
+    // raiseBenchmarkServer();
 // #endif
-    }
-    // net::SSLManager::instance().shutdown();
+    // runMulticoreEchoServers();
+    raiseHTTPSEchoServer();
+    // rlibuv::raiseBenchmarkServer();
+
+
+    net::SSLManager::instance().shutdown();
+
     Logger::destroy();
     return 0;
 }

src/http/samples/httpechoserver/httpechoserver.h

@@ -1,4 +1,6 @@
 #include "scy/http/server.h"
+#include "scy/net/sslmanager.h"
+#include "scy/net/sslsocket.h"
 #include "scy/application.h"
 
 
@@ -26,6 +28,24 @@ void raiseEchoServer()
 }
 
 
+void raiseHTTPSEchoServer()
+{
+    http::Server srv(address, std::make_shared<net::SSLSocket>(
+      net::SSLManager::instance().defaultServerContext()));
+    srv.start();
+
+    srv.Connection += [](http::ServerConnection::Ptr conn) {
+        conn->Payload += [](http::ServerConnection& conn, const MutableBuffer& buffer) {
+            conn.send(bufferCast<const char*>(buffer), buffer.size());
+            conn.close();
+        };
+    };
+
+    std::cout << "HTTPS server listening on " << address << std::endl;
+    waitForShutdown();
+}
+
+
 void raiseMulticoreEchoServer()
 {
     auto loop = uv::createLoop();

src/http/src/connection.cpp

@@ -217,6 +217,13 @@ void Connection::shouldSendHeader(bool flag)
 }
 
 
+bool Connection::secure() const
+{
+    return _socket
+        && _socket->transport() == net::SSLTCP;
+}
+
+
 //
 // HTTP Client Connection Adapter
 //
@@ -267,7 +274,7 @@ ssize_t ConnectionAdapter::send(const char* data, size_t len, int flags)
 
         // Send body / chunk
         return SocketAdapter::send(data, len, flags);
-    // } 
+    // }
     // catch (std::exception& exc) {
     //     LError("Send error: ", exc.what())
     //

src/http/src/parser.cpp

@@ -317,14 +317,14 @@ int Parser::on_headers_complete(http_parser* parser)
         self->onHeader(self->_lastHeaderField, self->_lastHeaderValue);
     }
 
-    /// HTTP version
+    // HTTP version
     // start_line_.version(parser_.http_major, parser_.http_minor);
 
-    /// KeepAlive
-    //self->_message->setKeepAlive(http_should_keep_alive(&parser) > 0);
-    //self->_shouldKeepAlive = http_should_keep_alive(&parser) > 0;
+    // KeepAlive
+    // self->_message->setKeepAlive(http_should_keep_alive(&parser) > 0);
+    // self->_shouldKeepAlive = http_should_keep_alive(&parser) > 0;
 
-    /// Request HTTP method
+    // Request HTTP method
     if (self->_request)
         self->_request->setMethod(http_method_str(static_cast<http_method>(parser->method)));
 
@@ -345,10 +345,11 @@ int Parser::on_body(http_parser* parser, const char* at, size_t len)
 
 int Parser::on_message_complete(http_parser* parser)
 {
-    // When http_parser finished receiving a message, signal message complete
     auto self = reinterpret_cast<Parser*>(parser->data);
     assert(self);
 
+    // Signal message complete when the http_parser
+    // has finished receiving the message.
     self->onMessageEnd();
     return 0;
 }

src/http/src/server.cpp

@@ -116,6 +116,7 @@ void Server::onConnectionReady(ServerConnection& conn)
 void Server::onConnectionClose(ServerConnection& conn)
 {
     // LTrace("On connection closed")
+
     for (auto it = _connections.begin(); it != _connections.end(); ++it) {
         if (it->get() == &conn) {
             _connections.erase(it);
@@ -157,6 +158,7 @@ ServerConnection::ServerConnection(Server& server, net::TCPSocket::Ptr socket)
     , _upgrade(false)
 {
     // LTrace("Create")
+
     replaceAdapter(new ConnectionAdapter(this, HTTP_REQUEST));
 }
 
@@ -168,7 +170,6 @@ ServerConnection::~ServerConnection()
     close();
 
     if (_responder) {
-        LTrace("Destroy: Responder: ", _responder)
         delete _responder;
     }
 }
@@ -241,8 +242,8 @@ void ServerConnection::onHeaders()
     _responder = _server.createResponder(*this);
 
     // Upgraded connections don't receive the onHeaders callback
-     if (_responder && !_upgrade)
-         _responder->onHeaders(_request);
+    if (_responder && !_upgrade)
+        _responder->onHeaders(_request);
 }
 
 

src/http/tests/httptests.cpp

@@ -234,7 +234,6 @@ int main(int argc, char** argv)
         expect(!conn->error().any());
     });
 
-
     //
     /// Google Drive Upload Test
     //

src/net/include/scy/net/sslcontext.h

@@ -303,8 +303,7 @@ inline SSL_CTX* SSLContext::sslContext() const
 
 /// Non-case sensitive conversion of a string to a VerificationMode enum.
 /// If verMode is illegal an ArgumentException is thrown.
-inline SSLContext::VerificationMode
-convertVerificationMode(const std::string& vMode)
+inline SSLContext::VerificationMode convertVerificationMode(const std::string& vMode)
 {
     std::string mode = util::toLower(vMode);
     SSLContext::VerificationMode verMode = SSLContext::VERIFY_STRICT;

src/net/samples/echoserver/echoserver.cpp

@@ -34,7 +34,7 @@ int main(int argc, char** argv)
         srvs.udp.start("0.0.0.0", UdpPort);
 
         std::cout << "TCP Lerver listening on " << srvs.tcp.server->address() << std::endl;
-        std::cout << "LSL Server listening on " << srvs.ssl.server->address() << std::endl;
+        std::cout << "SSL Server listening on " << srvs.ssl.server->address() << std::endl;
         std::cout << "UDP Lerver listening on " << srvs.udp.server->address() << std::endl;
 
         waitForShutdown([&](void*) {