fix: fix response headers

Author: zensh

.env

@@ -2,7 +2,7 @@ SERVER_ADDR=127.0.0.1:8080
 # if not set, use in-memory cache
 # REDIS_URL=127.0.0.1:6379
 POLL_INTERVAL=100 # in milliseconds
-REQUEST_TIMEOUT=10000 # in milliseconds
+REQUEST_TIMEOUT=30000 # in milliseconds
 LOG_LEVEL=info # debug, info, warn, error
 # cert file path to enable https, for example: /etc/https/mydomain.crt
 TLS_CERT_FILE = ""

Cargo.lock

@@ -15,7 +15,7 @@ strip = true
 opt-level = 's'
 
 [workspace.package]
-version = "1.1.5"
+version = "1.1.6"
 edition = "2021"
 repository = "https://github.com/ldclabs/idempotent-proxy"
 keywords = ["idempotent", "reverse", "proxy", "icp"]

Cargo.toml

@@ -83,7 +83,7 @@ export class ResponseData {
       if (key == 'content-type') {
         this.mime = value
       } else if (
-        key != 'content-length' &&
+        key != 'content-length' && key != 'transfer-encoding' &&
         (fi.length == 0 || fi.includes(key))
       ) {
         this.headers.push([key, value])

src/idempotent-proxy-cf-worker/src/util.ts

@@ -123,12 +123,17 @@ impl ResponseData {
 
         for (k, v) in headers.iter() {
             if let Ok(v) = v.to_str() {
-                let k = k.as_str();
-                if k == "content-type" {
-                    self.mime = v.to_string();
-                } else if k != "content-length" && (filtering.is_empty() || filtering.contains(&k))
-                {
-                    self.headers.push((k.to_string(), v.to_string()));
+                match k.as_str() {
+                    "content-type" => {
+                        self.mime = v.to_string();
+                    }
+                    "content-length" | "transfer-encoding" => {
+                        continue;
+                    }
+                    k if filtering.is_empty() || filtering.contains(&k) => {
+                        self.headers.push((k.to_string(), v.to_string()));
+                    }
+                    _ => {}
                 }
             }
         }

src/idempotent-proxy-server/src/cache/mod.rs

@@ -1,7 +1,7 @@
 use axum::{
     body::to_bytes,
     extract::{Request, State},
-    response::{IntoResponse, Response},
+    response::IntoResponse,
 };
 use base64::{engine::general_purpose, Engine};
 use http::{header::AsHeaderName, HeaderMap, HeaderValue, StatusCode};
@@ -72,7 +72,7 @@ impl AppState {
 pub async fn proxy(
     State(app): State<AppState>,
     req: Request,
-) -> Result<Response, (StatusCode, String)> {
+) -> Result<impl IntoResponse, (StatusCode, String)> {
     // Access control
     let agent = if !app.ecdsa_pub_keys.is_empty() || !app.ed25519_pub_keys.is_empty() {
         let token = extract_header(req.headers(), &HEADER_PROXY_AUTHORIZATION, || {
@@ -161,7 +161,7 @@ pub async fn proxy(
                     agent = agent,
                     idempotency_key = idempotency_key;
                     "");
-        return Ok(res.into_response());
+        return Ok(res);
     }
 
     let res = {
@@ -201,7 +201,7 @@ pub async fn proxy(
                 .await
                 .map_err(bad_gateway)?;
 
-            Ok(rd.into_response())
+            Ok(rd)
         } else {
             Err((status, String::from_utf8_lossy(&res_body).to_string()))
         }