找到bug

Author: dayu521

src/hcpp-cfg.json

@@ -27,7 +27,7 @@
             "host_":"avatars.githubusercontent.com",
             "svc_":"443",   
             "url_":"",      
-            "mitm_":true,   
+            "mitm_":false,   
             "doh_":true,
             "sni_host_":"www.baidu.com",     
             "close_sni_":false  
@@ -36,7 +36,7 @@
             "host_":"github.githubassets.com",
             "svc_":"443",   
             "url_":"",      
-            "mitm_":true,   
+            "mitm_":false,   
             "doh_":true,
             "sni_host_":"www.baidu.com",    
             "close_sni_":false  

src/http/httpclient.h

@@ -50,6 +50,8 @@ namespace hcpp
 
         virtual http_request make_request() const;
 
+        virtual void init(){};
+
     protected:
         std::shared_ptr<memory> mem_;
     };

src/https/mitm_svc.cpp

@@ -82,6 +82,7 @@ namespace hcpp
             //  X509_NAME_oneline(X509_get_subject_name(cert), subject_name, sizeof(subject_name)); });
         };
     }
+    
     awaitable<void> mitm_svc::make_memory(std::string svc_host, std::string svc_service)
     {
         try
@@ -98,14 +99,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)
+                // XXX 这里不能用shared_from_this,因为回调会一直保持当前对象的智能指针,不释放
+                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_)
                         {
-                            log::info("mitm_svc::make_memory: 校验{}开始",host);
+                            log::info("mitm_svc::make_memory: 校验{}开始", host);
                             return verify_fun_(preverified, v_ctx);
                         }
                         return true;
@@ -116,6 +117,7 @@ namespace hcpp
                     }
                 };
                 ssl_m->set_verify_callback(verify_fun);
+                //XXX 这里的async_handshake会阻塞住线程,因此要在单独的协程里再进行.所以当前函数不能调用在监听连接的时候
                 co_await ssl_m->async_handshake();
                 m_ = ssl_m;
                 co_return;
@@ -186,7 +188,6 @@ namespace hcpp
         chc_->service_ = service;
         m->check(*this);
         co_await channel_->async_send(asio::error_code{}, chc_);
-        log::error("channel_tunnel::make_tunnel: 建立channel tunnel {}", host);
     }
 
     void channel_tunnel::make(std::unique_ptr<tcp_socket> sock)
@@ -209,6 +210,11 @@ namespace hcpp
         return hr;
     }
 
+    void https_client::init()
+    {
+        //TODO 在这里实现创建假证书
+    }
+
     awaitable<std::shared_ptr<memory>> channel_client::make(subject_identify si) &&
     {
         auto e = co_await this_coro::executor;

src/https/mitm_svc.h

@@ -39,6 +39,8 @@ namespace hcpp
     {
         virtual http_request make_request() const override;
 
+        virtual void init() override;
+
         void set_mem(std::shared_ptr<memory> m)
         {
             mem_ = m;

src/httpserver.cpp

@@ -19,6 +19,7 @@ namespace hcpp
 
     awaitable<void> http_do(std::unique_ptr<http_client> client, std::shared_ptr<service_keeper> sk)
     {
+        client->init();
         while (true)
         {
             auto ss = client->get_memory();
@@ -210,6 +211,7 @@ namespace hcpp
                 try
                 {
                     std::shared_ptr<channel_client> cc = co_await c->async_receive();
+                    //BUG 这里以下部分需要放到协程执行,因为一些操作会阻塞住线程
                     auto hsc = std::make_unique<https_client>();
                     hsc->host_ = cc->host_;
                     hsc->service_ = cc->service_;
@@ -249,7 +251,6 @@ namespace hcpp
 
                     hsc->set_mem(co_await std::move(*cc).make(std::move(si)));
 
-                    log::error("开始http_do {}", hsc->host_);
                     co_spawn(executor, http_do(std::move(hsc), std::move(sk)), detached);
                 }
                 catch (const std::exception &e)
@@ -287,7 +288,7 @@ namespace hcpp
             executor.stop();
             delete p; });
 
-        co_await co_spawn(executor,https_listener(),use_awaitable);
+        co_await co_spawn(executor, https_listener(), use_awaitable);
         // co_await https_listener();
         co_return;
     }