mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-11 08:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

XHTTP server: Finish stream-up's HTTP POST when its request.Body is closed

Browse Source 
https://github.com/XTLS/Xray-core/issues/4373#issuecomment-2647908310

Fixes https://github.com/XTLS/Xray-core/issues/4373
This commit is contained in:
RPRX 2025-02-10 13:56:13 +00:00 committed by GitHub
parent 2d7ca4a6a6
commit dcd7e92c45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
transport/internet/splithttp/hub.go
View File

@ -161,7 +161,7 @@ func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
} }
scMaxEachPostBytes := int(h.ln.config.GetNormalizedScMaxEachPostBytes().To) scMaxEachPostBytes := int(h.ln.config.GetNormalizedScMaxEachPostBytes().To)
if request.Method == "POST" && sessionId != "" { if request.Method == "POST" && sessionId != "" { // stream-up, packet-up
seq := "" seq := ""
if len(subpath) > 1 { if len(subpath) > 1 {
seq = subpath[1] seq = subpath[1]
@ -173,8 +173,12 @@ func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
writer.WriteHeader(http.StatusBadRequest) writer.WriteHeader(http.StatusBadRequest)
return return
} }
uploadDone := done.New()
err = currentSession.uploadQueue.Push(Packet{ err = currentSession.uploadQueue.Push(Packet{
Reader: request.Body, Reader: &httpRequestBodyReader{
requestReader: request.Body,
uploadDone: uploadDone,
},
}) })
if err != nil { if err != nil {
errors.LogInfoInner(context.Background(), err, "failed to upload (PushReader)") errors.LogInfoInner(context.Background(), err, "failed to upload (PushReader)")
@ -199,8 +203,12 @@ func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
} }
}() }()
} }
<-request.Context().Done() select {
case <-request.Context().Done():
case <-uploadDone.Wait():
}
} }
uploadDone.Close()
return return
} }
@ -243,7 +251,7 @@ func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
} }
writer.WriteHeader(http.StatusOK) writer.WriteHeader(http.StatusOK)
} else if request.Method == "GET" || sessionId == "" { } else if request.Method == "GET" || sessionId == "" { // stream-down, stream-one
responseFlusher, ok := writer.(http.Flusher) responseFlusher, ok := writer.(http.Flusher)
if !ok { if !ok {
panic("expected http.ResponseWriter to be an http.Flusher") panic("expected http.ResponseWriter to be an http.Flusher")
@ -283,7 +291,7 @@ func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
reader: request.Body, reader: request.Body,
remoteAddr: remoteAddr, remoteAddr: remoteAddr,
} }
if sessionId != "" { if sessionId != "" { // if not stream-one
conn.reader = currentSession.uploadQueue conn.reader = currentSession.uploadQueue
} }
@ -302,6 +310,20 @@ func (h *requestHandler) ServeHTTP(writer http.ResponseWriter, request *http.Req
} }
} }
type httpRequestBodyReader struct {
requestReader io.ReadCloser
uploadDone *done.Instance
}
func (c *httpRequestBodyReader) Read(b []byte) (int, error) {
return c.requestReader.Read(b)
}
func (c *httpRequestBodyReader) Close() error {
defer c.uploadDone.Close()
return c.requestReader.Close()
}
type httpResponseBodyWriter struct { type httpResponseBodyWriter struct {
sync.Mutex sync.Mutex
responseWriter http.ResponseWriter responseWriter http.ResponseWriter