增加*.abc.com类型的主机名

Author: dayu521

doc/1.txt

@@ -76,6 +76,8 @@ vscode
     Shift+Alt+Right     扩大选择块
     Shift+Alt+Left      减小选择块
     Ctrl+,          打开设置面板
+    Ctrl+Shift+-  向前
+    Ctrl+Alt+-  向后
 
 常用操作
     定位当前打开的文件在左侧的位置      右键打开的文件编辑器的tab页,点击 reveal in explorer view

main.cpp

@@ -68,12 +68,15 @@ int main(int argc, char **argv)
         }
         mhs.set_ch(std::make_shared<hcpp::socket_channel>(io_context, 10));
 
-        hs.attach_tunnel([&mhs](auto &&c, auto h, auto s)
-                         {
-                    if(auto r=mhs.find_tunnel(h,s);r){
-                        return *r;
-                    }
-                      return c; });
+        hs.attach_tunnel(
+            [&mhs](auto &&c, auto h, auto s)
+            {
+                if (auto r = mhs.find_tunnel(h, s); r)
+                {
+                    return *r;
+                }
+                return c;
+            });
 
         auto exit_handler = [&io_context](auto &&eptr)
         {
@@ -89,7 +92,7 @@ int main(int argc, char **argv)
             }
         };
 
-        co_spawn(io_context, hs.wait_http(c->get_port(),io_context), exit_handler);
+        co_spawn(io_context, hs.wait_http(c->get_port(), io_context), exit_handler);
         co_spawn(io_context, mhs.wait_c(c->get_proxy_service()), exit_handler);
 
         auto create_thread = [&](auto self, int i) -> void
@@ -113,7 +116,7 @@ int main(int argc, char **argv)
                 spdlog::debug("线程{}退出成功", i);
             }
         };
-        auto core_size=std::thread::hardware_concurrency()%32;
+        auto core_size = std::thread::hardware_concurrency() % 32;
         // 为了防止对象在多线程情况下销毁出问题
         std::jthread t(create_thread, create_thread, core_size);
 

src/config.cpp

@@ -6,6 +6,7 @@
 #include <fstream>
 #include <filesystem>
 #include <tuple>
+#include <regex>
 
 #include <spdlog/spdlog.h>
 
@@ -124,14 +125,39 @@ namespace hcpp
 
     bool config::config_to(mimt_https_server &mhs)
     {
+        static thread_local std::regex r(R"(^\*|((\*\.)+.+)$)");
+
+        std::map<unsigned int, std::pair<std::regex, std::string>> star_map;
+
         for (auto &&i : cs_.proxy_service_)
         {
             if (i.mitm_)
             {
+                std::smatch mr;
+                if (std::regex_match(i.host_, mr, r))
+                {
+                    auto nstar = mr.size();
+                    if (nstar > 2)
+                    {
+                        nstar -= 2;
+                    }
+                    assert(nstar > 0);
+                    if (i.host_ == "*")
+                    {
+                        i.host_ = "*.";
+                    }
+                    auto s = std::regex_replace(i.host_, std::regex(R"(\*\.)"), R"(.+\.)");
+                    log::info("构造的正则: {} -> {}", i.host_, s);
+                    star_map.insert({nstar, std::make_pair(std::regex(std::move(s)), i.svc_)});
+                }
+
                 mhs.tunnel_set_.insert({i.host_, i.svc_});
             }
         }
-
+        for (auto &&i : star_map)
+        {
+            mhs.tunnel_regx_list_.push_back(std::move(i.second));
+        }
         subject_identify si;
 
         auto si_tu = std::forward_as_tuple(cs_.ca_pkey_path_, cs_.ca_cert_path_);
@@ -145,7 +171,9 @@ namespace hcpp
                 if (path_prefix != nullptr)
                 {
                     i = path_prefix + i.substr(1);
-                }else{
+                }
+                else
+                {
                     log::warn("没有HOME系统变量,不处理 ~");
                 }
             }
@@ -246,7 +274,7 @@ namespace hcpp
                 {
                     ofs << si.pkey_pem_;
                     ofs.close();
-                    log::warn("config::config_to: 保存{}成功",cs_.ca_pkey_path_);
+                    log::warn("config::config_to: 保存{}成功", cs_.ca_pkey_path_);
                 }
                 else
                 {
@@ -261,7 +289,7 @@ namespace hcpp
                 {
                     ofs2 << si.cert_pem_;
                     ofs2.close();
-                    log::warn("config::config_to: 保存{}成功",cs_.ca_cert_path_);
+                    log::warn("config::config_to: 保存{}成功", cs_.ca_cert_path_);
                 }
                 else
                 {

src/hcpp-cfg.json

@@ -6,7 +6,8 @@
     "dns_provider_": [
         {
             "provider_": "1.1.1.1", //取一个名字
-            "host_": "1.1.1.1"
+            // "host_": "1.1.1.1"
+            "host_": "9.9.9.9"
         }
     ],
     "mitm_server_":{
@@ -53,7 +54,7 @@
         }
         ,
         {
-            "host_":"www.baidu.com",
+            "host_":"*.github.io",
             "svc_":"443",  
             "url_":"",      
             "mitm_":true,   

src/http/http_svc_keeper.cpp

@@ -114,7 +114,7 @@ namespace hcpp
             {
                 std::unique_lock<std::shared_mutex> lock(shm_c_);
                 // 插入成功失败都无所谓
-                cache_.insert({svc, v});
+                cache_.insert(std::make_pair(svc, v));
             }
             m = v;
         }

src/httpserver.cpp

@@ -9,6 +9,8 @@
 #include <limits>
 #include <chrono>
 #include <map>
+#include <ranges>
+#include <algorithm>
 
 #include <spdlog/spdlog.h>
 
@@ -136,7 +138,7 @@ namespace hcpp
                     }
                     else // TODO 用于控制自身行为
                     {
-                        if (auto p=base_handlers_.find({req.url_.data(),req.url_param_start_});p!=base_handlers_.end())
+                        if (auto p = base_handlers_.find({req.url_.data(), req.url_param_start_}); p != base_handlers_.end())
                         {
                             co_await ss->async_write_all((p->second)(req.url_));
                         }
@@ -158,8 +160,8 @@ namespace hcpp
             }
         }
     }
-    
-    void http_handler::add_handler(std::string_view path, std::function<std::string (std::string_view)> handler)
+
+    void http_handler::add_handler(std::string_view path, std::function<std::string(std::string_view)> handler)
     {
         base_handlers_.insert({path, handler});
     }
@@ -176,8 +178,7 @@ namespace hcpp
         hh.add_handler("/stop", [&ic](auto &&path)
                        { 
                         ic.stop(); 
-                        return "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 12\r\n\r\nserver stop!";
-                        });
+                        return "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 12\r\n\r\nserver stop!"; });
         for (;;)
         {
             try
@@ -299,7 +300,7 @@ namespace hcpp
         };
         std::jthread t(https_service);
 
-        std::unique_ptr<int, std::function<void(int *)>> ptr(new int(0), [ &executor](auto &&p)
+        std::unique_ptr<int, std::function<void(int *)>> ptr(new int(0), [&executor](auto &&p)
                                                              {
             log::info("work_guard分离");
             executor.stop();
@@ -313,10 +314,21 @@ namespace hcpp
 
     std::optional<std::shared_ptr<tunnel>> mimt_https_server::find_tunnel(std::string_view svc_host, std::string_view svc_service)
     {
+        auto can_proxy = false;
+
         if (tunnel_set_.contains({svc_host.data(), svc_service.data()}))
         {
-            return std::make_optional(std::make_shared<channel_tunnel>(channel_));
+            can_proxy = true;
         }
+        if (std::ranges::any_of(tunnel_regx_list_, [&svc_host, &svc_service](auto &&i) {
+                return std::regex_match(svc_host.data(),i.first)&&svc_service==i.second;
+            }))
+        {
+            can_proxy = true;
+        }
+
+        if (can_proxy)
+            return std::make_optional(std::make_shared<channel_tunnel>(channel_));
         return std::nullopt;
     }
 
@@ -332,7 +344,7 @@ namespace hcpp
 
     void mimt_https_server::set_ch(std::shared_ptr<socket_channel> ch)
     {
-        channel_=ch;
+        channel_ = ch;
     }
 
 } // namespace hcpp

src/httpserver.h

@@ -13,6 +13,7 @@
 #include <functional>
 #include <memory>
 #include <set>
+#include <regex>
 
 namespace hcpp
 {
@@ -91,6 +92,7 @@ namespace hcpp
         std::optional<std::shared_ptr<tunnel>> find_tunnel(std::string_view svc_host, std::string_view svc_service);
 
         std::set<std::pair<std::string, std::string>> tunnel_set_;
+        std::vector<std::pair<std::regex, std::string>> tunnel_regx_list_;
 
         void set_ch(std::shared_ptr<socket_channel> ch);