v

Author: dayu521

src/hcpp-cfg.json

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

src/http/httpclient.h

@@ -3,6 +3,7 @@
 #include "memory.h"
 #include "socket_wrap.h"
 #include "httpmsg.h"
+#include "asio_coroutine_net.h"
 
 #include <optional>
 
@@ -50,7 +51,7 @@ namespace hcpp
 
         virtual http_request make_request() const;
 
-        virtual void init(){};
+        virtual awaitable<void> init(){co_return;}
 
     protected:
         std::shared_ptr<memory> mem_;

src/https/mitm_svc.cpp

@@ -210,9 +210,10 @@ namespace hcpp
         return hr;
     }
 
-    void https_client::init()
+    awaitable<void> https_client::init()
     {
-        //TODO 在这里实现创建假证书
+        assert(init_);
+        co_await init_(*this);
     }
 
     awaitable<std::shared_ptr<memory>> channel_client::make(subject_identify si) &&

src/https/mitm_svc.h

@@ -35,22 +35,6 @@ namespace hcpp
     // HACK 好像只能支持发送存在默认构造函数的对象.所以不能使用std::unique_ptr
     // using socket_channel = asio::use_awaitable_t<>::as_default_on_t<concurrent_channel<void(asio::error_code, std::shared_ptr<tls_client>)>>;
 
-    struct https_client : public http_client
-    {
-        virtual http_request make_request() const override;
-
-        virtual void init() override;
-
-        void set_mem(std::shared_ptr<memory> m)
-        {
-            mem_ = m;
-        }
-
-    public:
-        std::string host_;
-        std::string service_;
-    };
-
     struct part_cert_info
     {
         std::vector<std::string> dns_name_;
@@ -63,6 +47,14 @@ namespace hcpp
         awaitable<std::shared_ptr<memory>> create(std::string host, std::string service) override;
     };
 
+    template <typename T>
+    class cache
+    {
+    public:
+        virtual std::optional<T> get() {}
+        virtual void put(T t) {}
+    };
+
     // https://zh.cppreference.com/w/cpp/memory/enable_shared_from_this
     // XXX std::shared_ptr 的构造函数检测无歧义且可访问的 enable_shared_from_this 基类（即强制公开继承）
     class mitm_svc : public http_svc_keeper, public std::enable_shared_from_this<mitm_svc>
@@ -90,7 +82,24 @@ namespace hcpp
         std::string sni_host_;
         bool enable_sni_ = true;
 
-        std::function<bool (bool preverified, ssl::verify_context &v_ctx)> verify_fun_{};
+        std::function<bool(bool preverified, ssl::verify_context &v_ctx)> verify_fun_{};
+    };
+
+    struct https_client : public http_client
+    {
+        virtual http_request make_request() const override;
+
+        virtual awaitable<void> init() override;
+
+        void set_mem(std::shared_ptr<memory> m)
+        {
+            mem_ = m;
+        }
+
+    public:
+        std::string host_;
+        std::string service_;
+        std::function<awaitable<void> (https_client & )> init_{}; 
     };
 
     class channel_tunnel : public tunnel, public std::enable_shared_from_this<channel_tunnel>, public mem_move

src/httpserver.cpp

@@ -19,7 +19,7 @@ namespace hcpp
 
     awaitable<void> http_do(std::unique_ptr<http_client> client, std::shared_ptr<service_keeper> sk)
     {
-        client->init();
+        co_await client->init();
         while (true)
         {
             auto ss = client->get_memory();
@@ -211,11 +211,10 @@ namespace hcpp
                 try
                 {
                     std::shared_ptr<channel_client> cc = co_await c->async_receive();
-                    //BUG 这里以下部分需要放到协程执行,因为一些操作会阻塞住线程
+                    // BUG 这里以下部分需要放到协程执行,因为一些操作会阻塞住线程
                     auto hsc = std::make_unique<https_client>();
                     hsc->host_ = cc->host_;
                     hsc->service_ = cc->service_;
-                    log::error("channel_client: {}", hsc->host_);
                     if (!cc->sock_)
                     {
                         log::error("无法获取socket");
@@ -224,32 +223,35 @@ namespace hcpp
                     // TODO 抽象工厂方法
                     auto sk = std::make_shared<mitm_svc>();
 
-                    subject_identify si{};
-                    if (auto i = cr_ps_map.find(hsc->host_); i != cr_ps_map.end())
+                    hsc->init_ = [&cr_ps_map,sk,cc,ca_subject](https_client &self)->awaitable<void>
                     {
-                        sk->set_sni_host(i->second.sni_host_);
-                        if (i->second.close_sni_)
-                            sk->close_sni();
-                    }
+                        subject_identify si{};
+                        if (auto i = cr_ps_map.find(self.host_); i != cr_ps_map.end())
+                        {
+                            sk->set_sni_host(i->second.sni_host_);
+                            if (i->second.close_sni_)
+                                sk->close_sni();
+                        }
 
-                    if (auto i = server_subject_map.find(hsc->host_); i != server_subject_map.end())
-                    {
-                        co_await sk->make_memory(hsc->host_, hsc->service_);
-                        si = i->second;
-                    }
-                    else
-                    {
-                        part_cert_info pci{};
-                        sk->add_SAN_collector(pci);
-                        co_await sk->make_memory(hsc->host_, hsc->service_);
-                        si = sk->make_fake_server_id(pci.dns_name_, ca_subject);
-                        // XXX 插入失败不用管
-                        server_subject_map.insert({hsc->host_, si});
-                        log::error("mimt_https_server::wait_c:创建server_subject_map缓存 => {}", hsc->host_);
-                        log::error("mimt_https_server::wait_c:当前缓存数量 {}", server_subject_map.size());
-                    }
+                        if (auto i = server_subject_map.find(self.host_); i != server_subject_map.end())
+                        {
+                            co_await sk->make_memory(self.host_, self.service_);
+                            si = i->second;
+                        }
+                        else
+                        {
+                            part_cert_info pci{};
+                            sk->add_SAN_collector(pci);
+                            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});
+                            log::error("mimt_https_server::wait_c:创建server_subject_map缓存 => {}", self.host_);
+                            log::error("mimt_https_server::wait_c:当前缓存数量 {}", server_subject_map.size());
+                        }
 
-                    hsc->set_mem(co_await std::move(*cc).make(std::move(si)));
+                        self.set_mem(co_await std::move(*cc).make(std::move(si)));
+                    };
 
                     co_spawn(executor, http_do(std::move(hsc), std::move(sk)), detached);
                 }