取消https缓存连接

dayu521 · dayu521 · commit 8b13a54c7c58 · 2024-02-07T23:01:55.000+08:00
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -54,41 +54,19 @@ jobs:
 
       - name: Package
         run: |
-            xmake pack -y -o ./package -F action_xmake.lua
+            xmake pack -y -o ./ -F action_xmake.lua
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
             name: hcpp-artifact
-            path: ./package/*
+            path: ./*.zip
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          draft: true
+          # draft: true
           # body_path: ${{ github.workspace }}-CHANGELOG.txt  
-          files: ./package/*
+          files: ./*.zip
           generate_release_notes: true
-
-          
-      # - name: Create Release
-      #   id: create_release
-      #   uses: actions/create-release@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     tag_name: ${{ github.ref }}
-      #     release_name: Release ${{ github.ref }}
-      #     draft: false
-      #     prerelease: false
-
-      # - name: Upload Release Asset
-      #   uses: actions/upload-release-asset@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: ${{ steps.sign_app.outputs.signedReleaseFile }}
-      #     asset_name: my-tv-${{ github.ref_name }}.apk
-      #     asset_content_type: application/vnd.android.package-archive
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ linux下使用clang>16,在debug下编译
 
 windows使用最新编译器
 
+打开终端或`wt`
+
 ```shell
     xmake g --proxy_pac=github_mirror.lua
 
@@ -30,7 +32,7 @@ windows使用最新编译器
 
 #### 例子
 
-当前测试了三个主机,`github.com`,`www.gitee.com`,`www.baidu.com`.这三者由mitm代理.使用下面的自签名的`ca证书`,签名了服务的证书.服务的证书包含了上述三个主机名
+当前测试了三个主机,`github.com`,`gitee.com`,`www.baidu.com`.这三者由mitm代理.使用下面的自签名的`ca证书`,签名了服务的证书.服务的证书包含了上述三个主机名
 
 其余主机都是正常的http proxy或者http tunnel代理
 
diff --git a/doc/cert/ca.txt b/doc/cert/ca.txt
@@ -56,7 +56,7 @@
     [alt_names]
     DNS.1 = github.com
     DNS.2 = www.baidu.com  
-	DNS.3 = www.gitee.com  
+	DNS.3 = gitee.com  
 
 然后，使用以下命令生成证书和密钥文件：
 
diff --git a/doc/cert/server.crt.pem b/doc/cert/server.crt.pem
@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/doc/cert/server.key.pem b/doc/cert/server.key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCb8ywKcQi0dQ1Z
-SBnLIT10PsAazfrhgtHUfaUnx98OK0fVHO8151DzqPVroiNwmzSgV7OccD7IUlYK
-XgVoqPTUzz3ANL+RJY4c0Gv7zVS2P/+/TYas+snVROV/jW/KYhnkNjsRrklGlsx/
-3hUUEoyJ8Ipk75s+oOLhvBbyeHvcvJelmh1Pkbf9VdBH6GYh2eEM2RKExbSDbSIh
-LUPM4hjknMh7gphdsJvUmbMm04cItwpmd4O/z7GpSV6i8LEq+Y9n6o2XwQYKLeTu
-b6cL33zs5asIOt+F1O6VPiYMR2AZfEWw+W50E9ylk2r3Rq8NlQiW60TXupQYQEnH
-oym+Tx9VAgMBAAECggEAHcaLNR8p21KyDsbubdNV6XkFsth7O02ABMNMolDOLOVk
-nLMelTsqQKuU2E0n2Rs5LBgyqf7gbd0Son4bKEWCIZPEJYusu+jgvm2pAHXO49FK
-YltKCIMFwFucOgNmQc0DRoh4NMMDKKAoQY3EloWIIdo0glshWA7d4t3Hv9nzREzN
-jjH9evSHLg3X97xuvhiWsfzlVTyxyA6qD56+dTEBPOQy+0/R6IWBdw9zmNVfaHEI
-cZrfNY9aUDOxP2hOZ8S3u7OLOWPC3ZJet04/zZOvT2JUh1TZY/bmv9fIdLAjbPLg
-t23ue81SU0nD79GFIM+3AhwZvRNPDRhFvX1O672prQKBgQDNz5RhxDgYlSpekH9N
-do+coCg/jH7odAMr6eZNRS9iPT10oQbvSVfKFkmf8Lf5/sGWBUTh+wg1Uc1Ftu0m
-74kBZlmt0JX4rz0AWJWVEhdDKKCismlyyzGCskeBKqbi3SndvyF9MIjGn/haOoDz
-uoFZZhp1ReSBQjLq/vOOmUW7nwKBgQDB+tt98bmxr2LTVWeyBFHXXicmmjTvrxXK
-y/RpFGyXuOrBn990IBTwAr+5rZuOZJo2B2Xigv4x5sxJTgUuNRMRjBDYT9prS31l
-xLP5Tlk4C/bhzEQu8pEI7tbN3vm/j5+lAfjh/JNzdwGuhgk0qI6AcjMTwUduyjMz
-qWyN7WXAiwKBgQCQxXfG3dPn1uWa52HlB4U106L8MMQEl7azaTDLIeOW4yUbqTnL
-kHfke5EGpLmFbSKXeNVfcMnxV71hUK+5N73T8j8a+SLFb98lIyr1VWhvoWB9kaqD
-SVNmcCnEPlBuPMx6YzwXZ9COh3CXZ5fV2leqnxv1ali2Y+6VRwnkQQTAWQKBgQCk
-uwtBBlGjAoVTYRjhhWeXFN78mkJQNYi1IsUZo32gzymVatZRgJknRb5ZyYPrxaVs
-MpYkaQfDivN7YSVnGy1pXmBDwnSDX6VLEmOgWRfNT+PF1zkkAVyHkIScajn/otF5
-SJZ6G4uAp9SmyC7zKB10GQclRKMMA+y9d6i3Up5xhwKBgD5R8Gy2waTLdj+sYE5+
-D3PNLp5z5tyeTYCZElI/K1Ik/+IkM8YItiNi+vhFxDpKZh0iauuOc1Bu48CSxxel
-/nBshpZLHwJww3cpGtFKcYrx+xLx6B7a4Y4ViHGGyoOe+O91Cr4nVAAXwHcyKRjm
-9mYR6a5w/MeUXEa1lvOWUafj
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbrtW9la/d/OU3
+JN4s33uP/oWFYDg12SmGdzAtLqOY0onz3zvQBsfWWnq2t23jXGG6wNEoVIXsmkG/
+QbrzO2HZZ+MEB5Kfo18m+FdFTpPIcEzBIM28kM1AtqpwuzoTnYUJzCMpOun2DzD0
+9xv0O8OQQoGp6rkZhngyZAo6ttOa/uUqs4veN92t/8PIlAOpeTwmcqB9f5RZOUR/
+IZVo29tDVP/6cw2PbCuTjKFnh+ARlsP8rYZj2y66EEP8OmaBrdbQSccpkwbslcbl
+w10Nf2dR/cVPO66vAvmBq/XJDDi5fkKC4aOAHVK/8wKKppl3Z3usIcXoRsxew+lX
+vdnCUyMXAgMBAAECggEAMD2u6yBtS8KmtRrP/SugTykVugm8njqPb1tKBYn52+vT
+5m1NjauHg68/xlL2exiEz4VbCM+yzxe6u1ycSKBwJtU02WQuUwcFtKGRTINqWXgr
+qrdg5nkn0X+rYvECWl9bYSDmUb4BtYp1dj2zckkTc2DfZ2hHeG76gxpL0sPmKOFL
+RDoE1XSXNGUDdPktTeeGARnogERT8uc5Ftu2NLsk7tyhv4dQMTw3Cciz+xkXidOW
+L24alB3y7sMbRSQLmg6eqxgxdoUMgimxeg+qrvHxqb4YsCzml0rsr0/PfVZNt49E
+ppidS+QnyG4JBcl7o8oE44K4SGmo8uOFzjwdJkBYSQKBgQD3PpUNPr7Pw+mxjECG
+yw+P4fMeE/x73paEBJJ9CAF58pM2yJqkm/IG53tXLUEGPb18cX6mCRkcw/xOqXbZ
+g06yLfu+3pK+o9GIVi2V8oE0viQkXVQW9auGgjsmaAiyl6zv7+qymGehi1C2ZK5Z
+xkmprupQ05Lnft6cs0CPZXehSQKBgQDjdmQnBmf0/AEHxHmoDqqjKGKg2oq2zKwX
+QeXfy3qIstcjh5VxKxyScZEF2mD9A6J9yerPM+PkyL5sO8jiB1eGlNLiFHiOqy9/
+DoB7GBmgCxSP/yxSZAdbnqwqCMdYYhG2XmVBx4gWv5uuWgbqoeMLbUxzgRZz1EfM
+a4hkdeUBXwKBgQChypwzDKpEv0k/3C2lh1/pocw8FIwWavRH884Ab6q3qFtZcDBy
+I3Jfvj7iL0Tr1p8WvhZIhI+gWUfUGeUiNWDcDGc+4dtZUU4eT3aJNyYB46M3ALO0
+SpMx9CrM2StH4yVR5cfJkx3NgqMQmBXXvYAav9GpjqoFPuph1JMcwyNjsQKBgG1q
+VNDk5vrUghZfb3nk3DYxxgfEOHeoSpvBajdV5PJ+vLhtjvhqGYtkL7OWEZODvRUv
+HNFhD53M5rSfqYj4qSSm0C5KVJekRuuiaTFNLX5r9g8yWvqi/VsYH470vBeKzSRh
+kemrdo4iy1t6GNui1dl4UQ86qDc9hPATRf+1KlyXAoGBANvOqXKggehmB2vfJIU+
+mRPGaNeQhBcmK8E/X86H1AhP8iXt1PuNuLIRYYRkrsNQUJmHmkQKqx6hZ16PhgiD
+HZO0MFvR7et9O74gVW9PrwzUWra/XPWcQ6tI4BHISj0Tk3ym67kB6XNGgFApgM69
+vAePjHwlNiVOmW1gBheTnjXw
 -----END PRIVATE KEY-----
diff --git a/main.cpp b/main.cpp
@@ -52,8 +52,8 @@ int main(int argc, char **argv)
         }
         auto c = hcpp::config::get_config(cfg_path);
         c->config_to(hcpp::slow_dns::get_slow_dns());
-        c->save_callback([sd = hcpp::slow_dns::get_slow_dns()](auto &&cs)
-                         { sd->save_hm(cs.hm_); });
+        // c->save_callback([sd = hcpp::slow_dns::get_slow_dns()](auto &&cs)
+        //                  { sd->save_hm(cs.hm_); });
 
         asio::io_context io_context;
 
@@ -76,13 +76,14 @@ int main(int argc, char **argv)
 
         co_spawn(io_context, hs.wait_http(c->get_port()), detached);
         co_spawn(io_context, mhs.wait_c(10), detached);
+        // co_spawn(io_context, []()->asio::awaitable<void>{co_await hcpp::nc->async_send(asio::error_code{}, "ok");}, detached);
 
-        auto create_thread = [&io_context](auto self, int i) -> void
+        auto create_thread = [&](auto self, int i) -> void
         {
             if (i > 0)
             {
-                std::jthread j(self, self, i - 1);
                 spdlog::debug("线程{}创建成功",i);
+                std::jthread j(self, self, i - 1);
                 while (!io_context.stopped())
                 {
                     try
diff --git a/src/dns.cpp b/src/dns.cpp
@@ -128,41 +128,18 @@ namespace hcpp
 
     awaitable<edp_lists> slow_dns::resolve(host_edp hedp)
     {
-        if (auto r = resolve_cache(hedp); !r)
-        {
-            auto ip_edp = co_await imp_->resolve(hedp);
-            local_dns.insert({hedp, ip_edp});
-
-            for (auto &&i : ip_edp)
-            {
-                spdlog::debug("{} => {} {}", hedp.first, i.address().to_string(), i.port());
-            }
-            spdlog::debug("当前线程已缓存endpoint查询 {} 个", local_dns.size());
+        auto ip_edp = co_await imp_->resolve(hedp);
 
-            co_return ip_edp;
-        }
-        else
+        for (auto &&i : ip_edp)
         {
-            co_return r.value();
+            spdlog::debug("{} => {} {}", hedp.first, i.address().to_string(), i.port());
         }
-    }
 
-    std::optional<edp_lists> slow_dns::resolve_cache(host_edp hedp)
-    {
-
-        if (auto ip_cache = local_dns.find(hedp); ip_cache != local_dns.end())
-        {
-            return {ip_cache->second};
-        }
-        else
-        {
-            return std::nullopt;
-        }
+        co_return ip_edp;
     }
 
     void slow_dns::remove_svc(const host_edp &hedp, std::string_view ip)
     {
-        local_dns.erase(hedp);
         imp_->remove(hedp);
         // TODO 全局缓存中对应条目,降低优先级或者直接取消这个ip
     }
diff --git a/src/dns.h b/src/dns.h
@@ -29,7 +29,6 @@ namespace hcpp
 
     public:
         awaitable<edp_lists> resolve(host_edp hedp);
-        std::optional<edp_lists> resolve_cache(host_edp hedp);
         void remove_svc(const host_edp & hedp, std::string_view ip);
 
         void load_hm(const std::vector<host_mapping> & hm);
@@ -44,8 +43,6 @@ namespace hcpp
     private:
         slow_dns();
 
-        inline static thread_local std::map<host_edp, edp_lists> local_dns;
-
         struct slow_dns_imp;
         std::shared_ptr<slow_dns_imp> imp_;
     };
diff --git a/src/dns/dnshttps.cc b/src/dns/dnshttps.cc
@@ -484,20 +484,12 @@ namespace harddns
 			std::cout << "读取数量正确" << std::endl;
 		}
 
-		std::cout << reply << std::endl;
-
 		auto ibb = 0;
 		for (auto &&i : reply.substr(fr))
 			std::cout << (((unsigned int)i) & 255) << " "; 
 		std::cout << std::endl;
 		auto r = parse_rfc8484(name, qtype, result, raw, reply, content_idx, cl);
-		// 	// else
-		// 	// 	r = parse_json(name, qtype, result, raw, reply, content_idx, cl);
 
-		// 	if (r >= 0)
-		// 		co_return r;
-		// 	continue;
-		// }
 		std::cout << "------" << std::endl;
 		for (auto &&i : result)
 		{
diff --git a/src/hcpp-cfg.json b/src/hcpp-cfg.json
@@ -29,7 +29,7 @@
             "host_":"avatars.githubusercontent.com",
             "svc_":"443",   //端口或服务名.例如 http https
             "url_":"",      //暂未使用
-            "mitm_":false,   
+            "mitm_":true,   
             "doh_":true,
             "sni_host_":"",     //假的主机名
             "close_sni_":false  //默认就是false.优先级高于sni_host_
@@ -39,10 +39,21 @@
             "host_":"github.githubassets.com",
             "svc_":"443",   //端口或服务名.例如 http https
             "url_":"",      //暂未使用
-            "mitm_":false,   
+            "mitm_":true,   
             "doh_":true,
             "sni_host_":"",     //假的主机名
             "close_sni_":false  //默认就是false.优先级高于sni_host_
         }
+        ,
+        {
+            
+            "host_":"gitee.com",
+            "svc_":"443",   //端口或服务名.例如 http https
+            "url_":"",      //暂未使用
+            "mitm_":true,   
+            "doh_":false,
+            "sni_host_":"",     //假的主机名
+            "close_sni_":false  //默认就是false.优先级高于sni_host_
+        }
     ]
 }
diff --git a/src/http/http_svc_keeper.cpp b/src/http/http_svc_keeper.cpp
@@ -337,7 +337,9 @@ namespace hcpp
         auto sock = co_await make_socket(host, service);
         if (sock)
         {
-            co_return std::make_shared<socket_memory>(std::move(*sock));
+            auto ss= std::make_shared<socket_memory>(std::move(*sock));
+            ss->host_=host;
+            co_return ss;
         }
         co_return std::shared_ptr<memory>{};
     }
diff --git a/src/http/socket_wrap.cpp b/src/http/socket_wrap.cpp
@@ -50,16 +50,14 @@ namespace hcpp
 
     awaitable<std::size_t> hcpp::socket_memory::async_write_some(std::string_view s)
     {
+        auto [e, n] = co_await sock_->async_write_some(buffer(s), as_tuple(use_awaitable));
         if (s.empty())
         {
             write_ok_ = false;
-            sock_->shutdown(tcp_socket::shutdown_send);
+            // sock_->shutdown(tcp_socket::shutdown_send);
             co_return 0;
         }
 
-        // HACK 不需要放到缓存
-        auto [e, n] = co_await sock_->async_write_some(buffer(s), as_tuple(use_awaitable));
-
         co_return n;
     }
 
@@ -81,7 +79,6 @@ namespace hcpp
         if (n == 0)
         {
             read_ok_ = false;
-            // sock_->shutdown(tcp_socket::shutdown_receive);
             co_return "";
         }
         r.resize(buff.size());
@@ -97,14 +94,13 @@ namespace hcpp
 
     awaitable<void> hcpp::socket_memory::async_write_all(std::string_view s)
     {
+        auto [e, n] = co_await async_write(*sock_, buffer(s, s.size()), as_tuple(use_awaitable));
         if (s.empty())
         {
             write_ok_ = false;
-            sock_->shutdown(tcp_socket::shutdown_send);
+            // sock_->shutdown(tcp_socket::shutdown_send);
             co_return;
         }
-
-        auto [e, n] = co_await async_write(*sock_, buffer(s, s.size()), as_tuple(use_awaitable));
     }
 
     std::string_view socket_memory::get_some()
@@ -170,19 +166,15 @@ namespace hcpp
     awaitable<std::optional<tcp_socket>> make_socket(std::string host, std::string service)
     {
         auto svc = host + ":" + service;
-        auto dns = slow_dns::get_slow_dns();
-        auto rrs = dns->resolve_cache({host, service});
-        if (!rrs)
-        {
-            rrs.emplace(co_await dns->resolve({host, service}));
-        }
+
+        auto host_list = co_await slow_dns::get_slow_dns()->resolve({host, service});
 
         auto e = co_await this_coro::executor;
         tcp_socket sock(e);
         sock.open(ip::tcp::v4());
         sock.set_option(socket_base::keep_alive(true));
 
-        if (auto [error, remote_endpoint] = co_await asio::async_connect(sock, *rrs, asio::experimental::as_single(asio::use_awaitable), 0); error)
+        if (auto [error, remote_endpoint] = co_await asio::async_connect(sock, host_list, asio::experimental::as_single(asio::use_awaitable), 0); error)
         {
             spdlog::info("连接远程出错 -> {}", svc);
             hcpp::slow_dns::get_slow_dns()->remove_svc({host, service}, remote_endpoint.address().to_string());
diff --git a/src/http/socket_wrap.h b/src/http/socket_wrap.h
diff --git a/src/https/mitm_svc.cpp b/src/https/mitm_svc.cpp
diff --git a/src/https/mitm_svc.h b/src/https/mitm_svc.h
diff --git a/src/https/ssl_socket_wrap.cpp b/src/https/ssl_socket_wrap.cpp
diff --git a/src/httpserver.cpp b/src/httpserver.cpp

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ int main(int argc, char **argv)`
`52`	`52`	`}`
`53`	`53`	`auto c = hcpp::config::get_config(cfg_path);`
`54`	`54`	`c->config_to(hcpp::slow_dns::get_slow_dns());`
`55`		`- c->save_callback([sd = hcpp::slow_dns::get_slow_dns()](auto &&cs)`
`56`		`- { sd->save_hm(cs.hm_); });`
	`55`	`+ // c->save_callback([sd = hcpp::slow_dns::get_slow_dns()](auto &&cs)`
	`56`	`+ // { sd->save_hm(cs.hm_); });`
`57`	`57`
`58`	`58`	`asio::io_context io_context;`
`59`	`59`
`@@ -76,13 +76,14 @@ int main(int argc, char **argv)`
`76`	`76`
`77`	`77`	`co_spawn(io_context, hs.wait_http(c->get_port()), detached);`
`78`	`78`	`co_spawn(io_context, mhs.wait_c(10), detached);`
	`79`	`+ // co_spawn(io_context, []()->asio::awaitable<void>{co_await hcpp::nc->async_send(asio::error_code{}, "ok");}, detached);`
`79`	`80`
`80`		`- auto create_thread = [&io_context](auto self, int i) -> void`
	`81`	`+ auto create_thread = [&](auto self, int i) -> void`
`81`	`82`	`{`
`82`	`83`	`if (i > 0)`
`83`	`84`	`{`
`84`		`- std::jthread j(self, self, i - 1);`
`85`	`85`	`spdlog::debug("线程{}创建成功",i);`
	`86`	`+ std::jthread j(self, self, i - 1);`
`86`	`87`	`while (!io_context.stopped())`
`87`	`88`	`{`
`88`	`89`	`try`