feat: add local test directory support, enhance error logging with fd info, update SSL context to accept mode parameter, and implement thread-safe SSL socket operations

Author: chenxuan520

demo/web-server/build.sh

@@ -14,3 +14,11 @@ mv ./build/webserver ../bin
 
 cp ../bin/webserver ../pack/web-server
 cp ./config.json ../pack/web-server
+
+# this is for author self local test dir
+SOURCE_FILE=../bin/webserver
+TARGET_DIR=~/file/data/web/chenxuanweb
+if [ -d "$TARGET_DIR" ]; then
+    cp "$SOURCE_FILE" "$TARGET_DIR/"
+    echo "copy $SOURCE_FILE to $TARGET_DIR success"
+fi

src/cppnet/http/server/http_server.cpp

@@ -331,7 +331,8 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
     if (soc->err_no() == EAGAIN || soc->err_no() == EWOULDBLOCK) {
       logger_->Error("[soc.ReadUntil]: read timeout");
     } else {
-      logger_->Error("[soc.ReadUntil]:" + soc->err_msg());
+      logger_->Error("[soc.ReadUntil]:" + soc->err_msg() +
+                     " soc:" + std::to_string(event_soc.fd()));
     }
     server.RemoveSoc(event_soc);
     soc->Close();

src/cppnet/server/io_multiplexing/epoll.cpp

@@ -7,8 +7,6 @@
 
 namespace cppnet {
 
-Epoll::TriggerType Epoll::trigger_type_ = Epoll::TriggerType::kLevelTrigger;
-
 int Epoll::Init() {
   epoll_fd_ = CreateEpoll();
   if (epoll_fd_.status() != Socket::kInit) {

src/cppnet/server/io_multiplexing/epoll.hpp

@@ -19,9 +19,6 @@ class Epoll : public IOMultiplexingBase {
 
 private:
   Socket epoll_fd_;
-
-private:
-  static TriggerType trigger_type_;
 };
 
 } // namespace cppnet

src/cppnet/ssl/ssl_context.cpp

@@ -180,7 +180,8 @@ std::shared_ptr<SSLSocket> SSLContext::CreateSSLSocket() {
   return CreateSSLSocket(soc);
 }
 
-std::shared_ptr<SSLSocket> SSLContext::AcceptSSL(const Socket &soc) {
+std::shared_ptr<SSLSocket> SSLContext::AcceptSSL(const Socket &soc,
+                                                 SSLSocket::Mode soc_mode) {
   auto new_ssl = SSL_new(ssl_ctx_);
   if (new_ssl == nullptr) {
     err_msg_ = "[syserr]:create ssl failed";
@@ -190,12 +191,12 @@ std::shared_ptr<SSLSocket> SSLContext::AcceptSSL(const Socket &soc) {
   auto rc = SSL_accept(new_ssl);
   if (rc < 0) {
     err_msg_ = std::string("[syserr]:ssl accept failed ") +
-               ERR_error_string(ERR_get_error(), nullptr);
+               ERR_error_string(ERR_get_error(), nullptr) + std::to_string(rc);
     SSL_free(new_ssl);
     ERR_clear_error();
     return nullptr;
   }
-  return std::make_shared<SSLSocket>(new_ssl, soc);
+  return std::make_shared<SSLSocket>(new_ssl, soc, soc_mode);
 }
 
 int SSLContext::Close() {

src/cppnet/ssl/ssl_context.hpp

@@ -48,7 +48,9 @@ class SSLContext {
   /**
    * @brief: Accept socket ssl.
    */
-  std::shared_ptr<SSLSocket> AcceptSSL(const Socket &soc);
+  std::shared_ptr<SSLSocket>
+  AcceptSSL(const Socket &soc,
+            SSLSocket::Mode soc_mode = SSLSocket::Mode::kQuickly);
   /**
    * @brief: close ssl context
    */

src/cppnet/ssl/ssl_socket.cpp

@@ -1,3 +1,5 @@
+#include <memory>
+#include <mutex>
 #ifdef CPPNET_OPENSSL
 #include "openssl/err.h"
 #include "openssl/ssl.h"
@@ -7,7 +9,7 @@
 
 namespace cppnet {
 
-SSLSocket::SSLSocket(SSL *ssl, const Socket &soc) {
+SSLSocket::SSLSocket(SSL *ssl, const Socket &soc, Mode mode) {
   if (ssl == nullptr) {
     err_msg_ = "[logicerr]:ssl is nullptr";
     return;
@@ -20,6 +22,11 @@ SSLSocket::SSLSocket(SSL *ssl, const Socket &soc) {
   ssl_ = ssl;
   SSL_set_fd(ssl_, fd_);
   status_ = kInit;
+
+  if (mode_ == Mode::kSafely) {
+    pmutex_ = std::make_unique<std::mutex>();
+  }
+  mode_ = mode;
 }
 
 int SSLSocket::Close() {
@@ -33,6 +40,11 @@ int SSLSocket::Close() {
 }
 
 int SSLSocket::CloseSSL() {
+  std::shared_ptr<std::lock_guard<std::mutex>> plock_guard = nullptr;
+  if (mode_ == Mode::kSafely && pmutex_ != nullptr) {
+    plock_guard = std::make_shared<std::lock_guard<std::mutex>>(*pmutex_);
+  }
+
   if (ssl_ != nullptr) {
     SSL_shutdown(ssl_);
     SSL_free(ssl_);
@@ -61,6 +73,15 @@ int SSLSocket::Connect(Address &addr) {
 }
 
 int SSLSocket::IORead(void *buf, size_t len, int flag) {
+  std::shared_ptr<std::lock_guard<std::mutex>> plock_guard = nullptr;
+  if (mode_ == Mode::kSafely && pmutex_ != nullptr) {
+    plock_guard = std::make_shared<std::lock_guard<std::mutex>>(*pmutex_);
+    if (ssl_ == nullptr) {
+      err_msg_ = "[syserr]:ssl is nullptr";
+      return kLogicErr;
+    }
+  }
+
   if (flag == MSG_WAITALL) {
     auto rc = 0;
     auto total_len = 0;
@@ -80,6 +101,15 @@ int SSLSocket::IORead(void *buf, size_t len, int flag) {
 }
 
 int SSLSocket::IOWrite(const void *buf, size_t len, int flag) {
+  std::shared_ptr<std::lock_guard<std::mutex>> plock_guard = nullptr;
+  if (mode_ == Mode::kSafely && pmutex_ != nullptr) {
+    plock_guard = std::make_shared<std::lock_guard<std::mutex>>(*pmutex_);
+    if (ssl_ == nullptr) {
+      err_msg_ = "[syserr]:ssl is nullptr";
+      return kLogicErr;
+    }
+  }
+
   return SSL_write(ssl_, buf, len);
 }
 

src/cppnet/ssl/ssl_socket.hpp

@@ -1,16 +1,28 @@
 #pragma once
 
+#include <memory>
 #ifdef CPPNET_OPENSSL
 
 #include "../socket/socket.hpp"
+#include <mutex>
 #include <openssl/ssl.h>
 #include <string>
 namespace cppnet {
 
 class SSLSocket : public Socket {
 public:
-  SSLSocket(SSL *ssl, const Socket &soc);
+  /*
+   * @brief: ssl socket mode
+   * @note:
+   *  kQuickly: quick connect(not supported as a socket simultaneous scene)
+   *  kSafely: safely connect for thread(use mutex for simultaneous scene)
+   */
+  enum class Mode { kQuickly = 0, kSafely = 1 };
+
+public:
+  SSLSocket(SSL *ssl, const Socket &soc, Mode mode = Mode::kQuickly);
   ~SSLSocket() = default;
+  // forbiden copy
   SSLSocket(const SSLSocket &) = delete;
   SSLSocket &operator=(const SSLSocket &) = delete;
   /**
@@ -29,6 +41,7 @@ class SSLSocket : public Socket {
 
 public:
   inline std::string err_msg() const { return err_msg_; }
+  inline void set_mode(Mode mode) { mode_ = mode; }
 
 protected:
   int IORead(void *buf, size_t len, int flag = 0) override;
@@ -37,6 +50,8 @@ class SSLSocket : public Socket {
 private:
   SSL *ssl_ = nullptr;
   std::string err_msg_;
+  Mode mode_ = Mode::kQuickly;
+  std::shared_ptr<std::mutex> pmutex_ = nullptr;
 };
 
 } // namespace cppnet