mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-03-30 01:56:24 +00:00
HTTP inbound: Directly forward plain HTTP 1xx response header (#4547)
Fixes https://github.com/XTLS/Xray-core/issues/4545
This commit is contained in:
parent
e129b1e90d
commit
29e37e8a82
1 changed files with 33 additions and 1 deletions
|
@ -294,7 +294,7 @@ func (s *Server) handlePlainHTTP(ctx context.Context, request *http.Request, wri
|
|||
|
||||
responseDone := func() error {
|
||||
responseReader := bufio.NewReaderSize(&buf.BufferedReader{Reader: link.Reader}, buf.Size)
|
||||
response, err := http.ReadResponse(responseReader, request)
|
||||
response, err := readResponseAndHandle100Continue(responseReader, request, writer)
|
||||
if err == nil {
|
||||
http_proto.RemoveHopByHopHeaders(response.Header)
|
||||
if response.ContentLength >= 0 {
|
||||
|
@ -338,6 +338,38 @@ func (s *Server) handlePlainHTTP(ctx context.Context, request *http.Request, wri
|
|||
return result
|
||||
}
|
||||
|
||||
// Sometimes, server might send 1xx response to client
|
||||
// it should not be processed by http proxy handler, just forward it to client
|
||||
func readResponseAndHandle100Continue(r *bufio.Reader, req *http.Request, writer io.Writer) (*http.Response, error) {
|
||||
// have a little look of response
|
||||
peekBytes, err := r.Peek(56)
|
||||
if err == nil || err == bufio.ErrBufferFull {
|
||||
str := string(peekBytes)
|
||||
ResponseLine := strings.Split(str, "\r\n")[0]
|
||||
_, status, _ := strings.Cut(ResponseLine, " ")
|
||||
// only handle 1xx response
|
||||
if strings.HasPrefix(status, "1") {
|
||||
ResponseHeader1xx := []byte{}
|
||||
// read until \r\n\r\n (end of http response header)
|
||||
for {
|
||||
data, err := r.ReadSlice('\n')
|
||||
if err != nil {
|
||||
return nil, errors.New("failed to read http 1xx response").Base(err)
|
||||
}
|
||||
ResponseHeader1xx = append(ResponseHeader1xx, data...)
|
||||
if bytes.Equal(ResponseHeader1xx[len(ResponseHeader1xx)-4:], []byte{'\r', '\n', '\r', '\n'}) {
|
||||
break
|
||||
}
|
||||
if len(ResponseHeader1xx) > 1024 {
|
||||
return nil, errors.New("too big http 1xx response")
|
||||
}
|
||||
}
|
||||
writer.Write(ResponseHeader1xx)
|
||||
}
|
||||
}
|
||||
return http.ReadResponse(r, req)
|
||||
}
|
||||
|
||||
func init() {
|
||||
common.Must(common.RegisterConfig((*ServerConfig)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
|
||||
return NewServer(ctx, config.(*ServerConfig))
|
||||
|
|
Loading…
Add table
Reference in a new issue