fix(core): make session timeout configurable via Config

Author: GaspardKirira

include/vix/config/Config.hpp

@@ -63,6 +63,7 @@ namespace vix::config
     const std::string &getWafMode() const noexcept; // "off"|"basic"|"strict"
     int getWafMaxTargetLen() const noexcept;
     int getWafMaxBodyBytes() const noexcept;
+    int getSessionTimeoutSec() const noexcept;
 
   private:
     static constexpr const char *DEFAULT_DB_HOST = "localhost";
@@ -99,6 +100,9 @@ namespace vix::config
     std::string waf_mode_;
     int waf_max_target_len_;
     int waf_max_body_bytes_;
+
+    static constexpr int DEFAULT_SESSION_TIMEOUT_SEC = 20;
+    int session_timeout_sec_;
   };
 }
 

include/vix/session/Session.hpp

@@ -49,7 +49,6 @@ namespace vix::session
   using tcp = net::ip::tcp;
 
   constexpr size_t MAX_REQUEST_BODY_SIZE = 10 * 1024 * 1024;
-  constexpr auto REQUEST_TIMEOUT = std::chrono::seconds(20);
 
   class Session : public std::enable_shared_from_this<Session>
   {

src/config/Config.cpp

@@ -42,7 +42,7 @@ namespace vix::config
         db_host(DEFAULT_DB_HOST), db_user(DEFAULT_DB_USER), db_pass(DEFAULT_DB_PASS),
         db_name(DEFAULT_DB_NAME), db_port(DEFAULT_DB_PORT),
         server_port(DEFAULT_SERVER_PORT), request_timeout(DEFAULT_REQUEST_TIMEOUT),
-        rawConfig_(nlohmann::json::object()), io_threads_(DEFAULT_IO_THREADS), log_async_(DEFAULT_LOG_ASYNC), log_queue_max_(DEFAULT_LOG_QUEUE_MAX), log_drop_on_overflow_(DEFAULT_LOG_DROP_ON_OVERFLOW), waf_mode_(DEFAULT_WAF_MODE), waf_max_target_len_(DEFAULT_WAF_MAX_TARGET_LEN), waf_max_body_bytes_(DEFAULT_WAF_MAX_BODY_BYTES)
+        rawConfig_(nlohmann::json::object()), io_threads_(DEFAULT_IO_THREADS), log_async_(DEFAULT_LOG_ASYNC), log_queue_max_(DEFAULT_LOG_QUEUE_MAX), log_drop_on_overflow_(DEFAULT_LOG_DROP_ON_OVERFLOW), waf_mode_(DEFAULT_WAF_MODE), waf_max_target_len_(DEFAULT_WAF_MAX_TARGET_LEN), waf_max_body_bytes_(DEFAULT_WAF_MAX_BODY_BYTES), session_timeout_sec_(DEFAULT_SESSION_TIMEOUT_SEC)
   {
     std::vector<fs::path> candidate_paths;
 
@@ -123,6 +123,9 @@ namespace vix::config
 
     rawConfig_ = cfg;
 
+    // maintenant tu peux lire via getInt()
+    session_timeout_sec_ = getInt("server.session_timeout_sec", DEFAULT_SESSION_TIMEOUT_SEC);
+
     if (cfg.contains("database") && cfg["database"].contains("default"))
     {
       const auto &db = cfg["database"]["default"];
@@ -309,5 +312,6 @@ namespace vix::config
   const std::string &Config::getWafMode() const noexcept { return waf_mode_; }
   int Config::getWafMaxTargetLen() const noexcept { return waf_max_target_len_; }
   int Config::getWafMaxBodyBytes() const noexcept { return waf_max_body_bytes_; }
+  int Config::getSessionTimeoutSec() const noexcept { return session_timeout_sec_; }
 
 }

src/session/Session.cpp

@@ -65,20 +65,24 @@ namespace vix::session
   void Session::start_timer()
   {
     timer_ = std::make_shared<net::steady_timer>(socket_->get_executor());
-    timer_->expires_after(REQUEST_TIMEOUT);
+    const auto timeout = std::chrono::seconds(config_.getSessionTimeoutSec());
+    timer_->expires_after(timeout);
 
     std::weak_ptr<net::steady_timer> weak_timer = timer_;
     auto self = shared_from_this();
+
     timer_->async_wait(
-        [this, self, weak_timer](const boost::system::error_code &ec)
+        [this, self, weak_timer, timeout](const boost::system::error_code &ec)
         {
           auto t = weak_timer.lock();
           if (!t)
             return;
 
           if (!ec)
           {
-            log().log(Logger::Level::WARN, "[Session] Timeout ({}s), closing socket", REQUEST_TIMEOUT.count());
+            log().log(Logger::Level::WARN,
+                      "[Session] Timeout ({}s), closing socket",
+                      timeout.count());
             close_socket_gracefully();
           }
         });