>

Author: dayu521

src/config.cpp

@@ -38,7 +38,7 @@ namespace hcpp
             spdlog::error("{} : {}", config_path, j.get_errors());
             throw std::runtime_error("解析config出错");
         }
-        //BUG https://github.com/dayu521/lsf/issues/5
+        // BUG https://github.com/dayu521/lsf/issues/5
         lsf::json_to_struct_ignore_absence(*res, cs_);
 
         // 主机映射配置文件
@@ -112,33 +112,26 @@ namespace hcpp
         std::map<unsigned int, std::pair<std::regex, InterceptSet>> star_map;
         for (auto &&i : cs_.proxy_service_)
         {
-            if (i.doh_)
-            {
-                hh->add_intercept(std::make_pair(i.host_, i));
-            }
-            if (i.mitm_)
+            std::smatch mr;
+            if (std::regex_match(i.host_, mr, r))
             {
-                std::smatch mr;
-                if (std::regex_match(i.host_, mr, r))
+                auto nstar = mr.size();
+                if (nstar > 2)
                 {
-                    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)), std::move(i))});
+                    nstar -= 2;
                 }
-                else
+                assert(nstar > 0);
+                if (i.host_ == "*")
                 {
-                    hh->add_intercept(std::make_pair(i.host_, std::move(i)));
+                    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)), std::move(i))});
+            }
+            else
+            {
+                hh->add_intercept(std::make_pair(i.host_, std::move(i)));
             }
         }
 

src/hcpp-cfg.json

@@ -24,6 +24,15 @@
             "sni_host_":"www.baidu.com",     //假的主机名
             "close_sni_":false  //默认就是false.设置为true时,优先级高于sni_host_
         },
+        {
+            "host_":"*.github.com",
+            "svc_":"443",   //端口或服务名.例如 http https
+            "url_":"",      //暂未使用
+            "mitm_":false,   //使用mimt代理
+            "doh_":true,
+            "sni_host_":"www.baidu.com",     //假的主机名
+            "close_sni_":false  //默认就是false.设置为true时,优先级高于sni_host_
+        },
         {
             "host_":"avatars.githubusercontent.com",
             "svc_":"443",