From cf778eda4f89921eabed714922201efad02ce459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 11 Apr 2023 10:30:10 +0800 Subject: [PATCH] Fix v2ray http transport server read request --- transport/v2rayhttp/server.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/transport/v2rayhttp/server.go b/transport/v2rayhttp/server.go index bc81c50b..95588f43 100644 --- a/transport/v2rayhttp/server.go +++ b/transport/v2rayhttp/server.go @@ -102,12 +102,20 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) { } } - writer.WriteHeader(http.StatusOK) - writer.(http.Flusher).Flush() - var metadata M.Metadata metadata.Source = sHttp.SourceAddress(request) if h, ok := writer.(http.Hijacker); ok { + var requestBody *buf.Buffer + if contentLength := int(request.ContentLength); contentLength > 0 { + requestBody = buf.NewSize(contentLength) + _, err := requestBody.ReadFullFrom(request.Body, contentLength) + if err != nil { + s.fallbackRequest(request.Context(), writer, request, 0, E.Cause(err, "read request")) + return + } + } + writer.WriteHeader(http.StatusOK) + writer.(http.Flusher).Flush() conn, reader, err := h.Hijack() if err != nil { s.fallbackRequest(request.Context(), writer, request, 0, E.Cause(err, "hijack conn")) @@ -122,8 +130,12 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) { } conn = bufio.NewCachedConn(conn, cache) } + if requestBody != nil { + conn = bufio.NewCachedConn(conn, requestBody) + } s.handler.NewConnection(request.Context(), conn, metadata) } else { + writer.WriteHeader(http.StatusOK) conn := NewHTTP2Wrapper(&ServerHTTPConn{ NewHTTPConn(request.Body, writer), writer.(http.Flusher),