Add support for a delayed SSL handshake (#66)

Author: an-tao

CMakeLists.txt

@@ -86,10 +86,7 @@ find_package(OpenSSL)
 if(OpenSSL_FOUND)
   target_include_directories(${PROJECT_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR})
   target_link_libraries(${PROJECT_NAME} PRIVATE ${OPENSSL_LIBRARIES})
-  set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/ssl/SSLConnection.cc)
-else()
-  set(TRANTOR_SOURCES ${TRANTOR_SOURCES}
-                      trantor/net/ssl/SSLConnectionSkipped.cc)
+  add_definitions(-DUSE_OPENSSL)
 endif()
 
 find_path(CARES_INCLUDE_DIR ares.h)

trantor/net/TcpClient.cc

@@ -12,7 +12,6 @@
 #include <trantor/net/TcpClient.h>
 
 #include <trantor/utils/Logger.h>
-#include "ssl/SSLConnection.h"
 #include "Connector.h"
 #include "inner/TcpConnectionImpl.h"
 #include <trantor/net/EventLoop.h>
@@ -152,8 +151,13 @@ void TcpClient::newConnection(int sockfd)
     std::shared_ptr<TcpConnectionImpl> conn;
     if (sslCtxPtr_)
     {
-        conn = std::make_shared<SSLConnection>(
+#ifdef USE_OPENSSL
+        conn = std::make_shared<TcpConnectionImpl>(
             loop_, sockfd, localAddr, peerAddr, sslCtxPtr_, false);
+#else
+        LOG_FATAL << "OpenSSL is not found in your system!";
+        abort();
+#endif
     }
     else
     {
@@ -197,8 +201,11 @@ void TcpClient::removeConnection(const TcpConnectionPtr &conn)
 
 void TcpClient::enableSSL()
 {
-    // init OpenSSL
-    initOpenSSL();
+#ifdef USE_OPENSSL
     /* Create a new OpenSSL context */
     sslCtxPtr_ = newSSLContext();
+#else
+    LOG_FATAL << "OpenSSL is not found in your system!";
+    abort();
+#endif
 }

trantor/net/TcpConnection.h

@@ -24,6 +24,9 @@
 
 namespace trantor
 {
+class SSLContext;
+std::shared_ptr<SSLContext> newSSLServerContext(const std::string &certPath,
+                                                const std::string &keyPath);
 class TcpConnection
 {
   public:
@@ -94,10 +97,11 @@ class TcpConnection
     virtual size_t bytesSent() const = 0;
     virtual size_t bytesReceived() const = 0;
 
-    virtual bool isSSLConnection() const
-    {
-        return false;
-    }
+    virtual bool isSSLConnection() const = 0;
+
+    virtual void startClientEncryption(std::function<void()> callback) = 0;
+    virtual void startServerEncryption(const std::shared_ptr<SSLContext> &ctx,
+                                       std::function<void()> callback) = 0;
 
   private:
     std::shared_ptr<void> contextPtr_;

trantor/net/TcpServer.cc

@@ -14,7 +14,6 @@
 
 #include "Acceptor.h"
 #include "inner/TcpConnectionImpl.h"
-#include "ssl/SSLConnection.h"
 #include <trantor/net/TcpServer.h>
 #include <trantor/utils/Logger.h>
 #include <functional>
@@ -68,13 +67,17 @@ void TcpServer::newConnection(int sockfd, const InetAddress &peer)
     std::shared_ptr<TcpConnectionImpl> newPtr;
     if (sslCtxPtr_)
     {
-        newPtr =
-            std::make_shared<SSLConnection>(ioLoop,
-                                            sockfd,
-                                            InetAddress(
-                                                Socket::getLocalAddr(sockfd)),
-                                            peer,
-                                            sslCtxPtr_);
+#ifdef USE_OPENSSL
+        newPtr = std::make_shared<TcpConnectionImpl>(
+            ioLoop,
+            sockfd,
+            InetAddress(Socket::getLocalAddr(sockfd)),
+            peer,
+            sslCtxPtr_);
+#else
+        LOG_FATAL << "OpenSSL is not found in your system!";
+        abort();
+#endif
     }
     else
     {
@@ -161,9 +164,11 @@ const std::string TcpServer::ipPort() const
 void TcpServer::enableSSL(const std::string &certPath,
                           const std::string &keyPath)
 {
-    // init OpenSSL
-    initOpenSSL();
+#ifdef USE_OPENSSL
     /* Create a new OpenSSL context */
-    sslCtxPtr_ = newSSLContext();
-    initServerSSLContext(sslCtxPtr_, certPath, keyPath);
+    sslCtxPtr_ = newSSLServerContext(certPath, keyPath);
+#else
+    LOG_FATAL << "OpenSSL is not found in your system!";
+    abort();
+#endif
 }

trantor/net/callbacks.h

@@ -28,10 +28,8 @@ using TimerCallback = std::function<void()>;
 
 // the data has been read to (buf, len)
 class TcpConnection;
-class SSLConnection;
 class MsgBuffer;
 using TcpConnectionPtr = std::shared_ptr<TcpConnection>;
-using SSLConnectionPtr = std::shared_ptr<SSLConnection>;
 // tcp server and connection callback
 using RecvMessageCallback =
     std::function<void(const TcpConnectionPtr &, MsgBuffer *)>;
@@ -41,14 +39,6 @@ using CloseCallback = std::function<void(const TcpConnectionPtr &)>;
 using WriteCompleteCallback = std::function<void(const TcpConnectionPtr &)>;
 using HighWaterMarkCallback =
     std::function<void(const TcpConnectionPtr &, const size_t)>;
-// ssl server and connection callback
-using SSLRecvMessageCallback =
-    std::function<void(const SSLConnectionPtr &, MsgBuffer *)>;
-using SSLConnectionCallback = std::function<void(const SSLConnectionPtr &)>;
-using SSLCloseCallback = std::function<void(const SSLConnectionPtr &)>;
-using SSLWriteCompleteCallback = std::function<void(const SSLConnectionPtr &)>;
-using SSLHighWaterMarkCallback =
-    std::function<void(const SSLConnectionPtr &, const size_t)>;
 
 using OperationCompleteCallback = std::function<void(const TrantorError)>;