From ff4b6a6c68624f650e6c35595ffcd39450f321fd Mon Sep 17 00:00:00 2001
From: Zhang Jingqiang <zhangjingqiang@bytedance.com>
Date: Tue, 26 Nov 2024 14:35:18 +0800
Subject: [PATCH] g3proxy: read out reailer for ftp over http request

---
 g3proxy/src/serve/http_proxy/task/ftp/task.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/g3proxy/src/serve/http_proxy/task/ftp/task.rs b/g3proxy/src/serve/http_proxy/task/ftp/task.rs
index ce7c55912..401100ea2 100644
--- a/g3proxy/src/serve/http_proxy/task/ftp/task.rs
+++ b/g3proxy/src/serve/http_proxy/task/ftp/task.rs
@@ -477,6 +477,21 @@ impl<'a> FtpOverHttpTask<'a> {
                             );
                             self.upload(&mut ftp_client, clt_w, &mut body_reader, None)
                                 .await?;
+                            tokio::time::timeout(
+                                self.ctx.server_config.timeout.recv_req_header,
+                                body_reader.trailer(128),
+                            )
+                            .await
+                            .map_err(|_| {
+                                ServerTaskError::ClientAppTimeout(
+                                    "time out to read HTTP body trailer",
+                                )
+                            })?
+                            .map_err(|e| {
+                                ServerTaskError::ClientAppError(anyhow!(
+                                    "invalid chunked body: {e}"
+                                ))
+                            })?;
                             if !body_reader.finished() {
                                 // there may be trailer headers
                                 self.should_close = true;