=

Author: dayu521

main.cpp

@@ -113,7 +113,7 @@ int main(int argc, char **argv)
             }
         };
         // 为了防止对象在多线程情况下销毁出问题
-        // std::jthread t(create_thread, create_thread, 1);
+        std::jthread t(create_thread, create_thread, 1);
 
         io_context.run();
     }

src/https/mitm_svc.cpp

@@ -100,14 +100,14 @@ namespace hcpp
                     ssl_m->set_sni(sni_host_);
                 }
                 // XXX 这里不能用shared_from_this,因为回调会一直保持当前对象的智能指针,不释放
-                auto verify_fun = [verify_fun_ = verify_fun_, host = svc_host](bool preverified, auto &v_ctx)
+                auto verify_fun = [verify_fun = verify_fun_, host = svc_host](bool preverified, auto &v_ctx)
                 {
                     if (ssl::host_name_verification(host)(preverified, v_ctx))
                     {
-                        if (verify_fun_)
+                        if (verify_fun)
                         {
                             log::info("mitm_svc::make_memory: 校验{}开始", host);
-                            return verify_fun_(preverified, v_ctx);
+                            return verify_fun(preverified, v_ctx);
                         }
                         return true;
                     }
@@ -117,7 +117,7 @@ namespace hcpp
                     }
                 };
                 ssl_m->set_verify_callback(verify_fun);
-                //XXX 这里的async_handshake会阻塞住线程,因此要在单独的协程里再进行.所以当前函数不能调用在监听连接的时候
+                // XXX 这里的async_handshake会阻塞住线程,因此要在单独的协程里再进行.所以当前函数不能调用在监听连接的时候
                 co_await ssl_m->async_handshake();
                 m_ = ssl_m;
                 co_return;

src/https/ssl_socket_wrap.cpp

@@ -186,6 +186,7 @@ namespace hcpp
     {
         stream_type_ = ssl_stream_type::client;
         ctx_ = std::make_unique<ssl::context>(ssl::context::tls_client);
+        // ctx_ = std::make_unique<ssl::context>(ssl::context::sslv23);
         ssl_sock_ = std::make_unique<ssl_socket>(std::move(sock), *ctx_);
     }
 
@@ -238,7 +239,6 @@ namespace hcpp
 
     ssl_sock_mem::~ssl_sock_mem()
     {
-        ssl_sock_->set_verify_callback(verify_callback());
         try
         {
             ssl_sock_->lowest_layer().close();

src/httpserver.cpp

@@ -258,7 +258,9 @@ namespace hcpp
                         {
                             part_cert_info pci{};
                             sk->add_SAN_collector(pci);
+                            // 利用握手获取访问的主机的证书中的dns
                             co_await sk->make_memory(self.host_, self.service_);
+                            // 创建假的证书
                             si = sk->make_fake_server_id(pci.dns_name_, ca_subject);
                             // XXX 插入失败不用管
                             server_subject_map.insert({self.host_, si});

test/ssl/ssl_handshake.cpp

@@ -0,0 +1,33 @@
+#include <asio/ssl/stream.hpp>
+#include <asio/ip/tcp.hpp>
+#include <asio/awaitable.hpp>
+#include <asio/use_awaitable.hpp>
+
+#include <spdlog/spdlog.h>
+
+#include <print>
+
+using namespace asio;
+using tcp_socket_co = use_awaitable_t<>::as_default_on_t<ip::tcp::socket>;
+using ssl_stream_co=ssl::stream<tcp_socket_co>;
+
+// namespace log = spdlog;
+
+int main(int argc,char ** argv){
+
+    if(argc!=2){
+        std::println("Usage: {} <hostname>", argv[0]);
+        return 1;
+    }
+
+    asio::io_context io_context;
+
+    asio::ssl::context ctx{asio::ssl::context::tlsv12};
+    ctx.set_verify_mode(ssl::verify_peer);
+    ctx.set_default_verify_paths();
+
+    ssl_stream_co ssl_socket{io_context, ctx};
+
+    
+    return 0;
+}

xmake.lua

@@ -19,7 +19,7 @@ end
 -- https://xmake.io/#/zh-cn/package/remote_package?id=%e4%bd%bf%e7%94%a8%e8%87%aa%e5%bb%ba%e7%a7%81%e6%9c%89%e5%8c%85%e4%bb%93%e5%ba%93
 package("lsf")
     set_homepage(lsf_url)
-    set_description("json.")
+    set_description("json")
     set_urls(lsf_url)
     -- set_sourcedir(path.join(os.scriptdir(), "lib/lsf"))
 
@@ -107,6 +107,13 @@ target_end()
 --     add_files("test/src/a.cpp",{defines = "DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN"})
 --     add_tests("a_test")
 
+-- target("handshake_test")
+--     add_packages("spdlog")
+--     add_packages("asio") 
+--     add_packages(openssl_package_name)
+--     add_files("test/ssl/ssl_handshake.cpp")
+--     add_tests("handshake_test")
+
 -- 打包源码
 -- includes("@builtin/xpack")
 -- xpack("hcpp")