Refactor proxy.rs to rename serve_static to serve_request

Refactor web_func.rs to update serve_http_request authentication logic
arloor · Sep 26, 2024 · 7d6ef8f · 7d6ef8f
1 parent 88755c0
commit 7d6ef8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/rust_http_proxy/src/proxy.rs b/rust_http_proxy/src/proxy.rs
@@ -152,7 +152,7 @@ impl ProxyHandler {
                 // http2.0肯定是over tls的，所以不是普通GET/POST代理请求。
                 // URL中不包含host（GET / HTTP/1.1）也不是普通GET/POST代理请求。
                 return self
-                    .serve_static(
+                    .serve_request(
                         &req,
                         config_basic_auth,
                         never_ask_for_auth,
@@ -332,7 +332,7 @@ impl ProxyHandler {
         }
     }
 
-    async fn serve_static(
+    async fn serve_request(
         &self,
         req: &Request<Incoming>,
         config_basic_auth: &HashMap<String, String>,

diff --git a/rust_http_proxy/src/web_func.rs b/rust_http_proxy/src/web_func.rs
@@ -86,13 +86,12 @@ pub async fn serve_http_request(
         #[cfg(target_os = "linux")]
         (_, "/net") => _speed(&proxy_handler.net_monitor, _hostname, can_gzip).await,
         (_, "/metrics") => {
-            let (_, authed) = check_auth(
+            if let (_, false) = check_auth(
                 &proxy_handler.config.basic_auth,
                 req,
                 &client_socket_addr,
                 hyper::header::AUTHORIZATION,
-            );
-            if !authed {
+            ) {
                 return Ok(build_authenticate_resp(false));
             }
             #[cfg(feature = "bpf")]