black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-29 12:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix write http status after response sent

Browse source
This commit is contained in:
世界 2023-04-09 19:31:28 +08:00
parent d77940ab39
commit 55afaa87da
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
transport/v2raygrpclite/server.go
View file

@ -93,7 +93,9 @@ func (s *Server) fallbackRequest(ctx context.Context, writer http.ResponseWriter
} else if fErr == os.ErrInvalid { } else if fErr == os.ErrInvalid {
fErr = nil fErr = nil
} }
if statusCode > 0 {
writer.WriteHeader(statusCode) writer.WriteHeader(statusCode)
}
s.handler.NewError(request.Context(), E.Cause(E.Errors(err, E.Cause(fErr, "fallback connection")), "process connection from ", request.RemoteAddr)) s.handler.NewError(request.Context(), E.Cause(E.Errors(err, E.Cause(fErr, "fallback connection")), "process connection from ", request.RemoteAddr))
} }

6
transport/v2rayhttp/server.go
View file

@ -110,14 +110,14 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
if h, ok := writer.(http.Hijacker); ok { if h, ok := writer.(http.Hijacker); ok {
conn, reader, err := h.Hijack() conn, reader, err := h.Hijack()
if err != nil { if err != nil {
s.fallbackRequest(request.Context(), writer, request, http.StatusInternalServerError, E.Cause(err, "hijack conn")) s.fallbackRequest(request.Context(), writer, request, 0, E.Cause(err, "hijack conn"))
return return
} }
if cacheLen := reader.Reader.Buffered(); cacheLen > 0 { if cacheLen := reader.Reader.Buffered(); cacheLen > 0 {
cache := buf.NewSize(cacheLen) cache := buf.NewSize(cacheLen)
_, err = cache.ReadFullFrom(reader.Reader, cacheLen) _, err = cache.ReadFullFrom(reader.Reader, cacheLen)
if err != nil { if err != nil {
s.fallbackRequest(request.Context(), writer, request, http.StatusInternalServerError, E.Cause(err, "read cache")) s.fallbackRequest(request.Context(), writer, request, 0, E.Cause(err, "read cache"))
return return
} }
conn = bufio.NewCachedConn(conn, cache) conn = bufio.NewCachedConn(conn, cache)
@ -141,7 +141,9 @@ func (s *Server) fallbackRequest(ctx context.Context, writer http.ResponseWriter
} else if fErr == os.ErrInvalid { } else if fErr == os.ErrInvalid {
fErr = nil fErr = nil
} }
if statusCode > 0 {
writer.WriteHeader(statusCode) writer.WriteHeader(statusCode)
}
s.handler.NewError(request.Context(), E.Cause(E.Errors(err, E.Cause(fErr, "fallback connection")), "process connection from ", request.RemoteAddr)) s.handler.NewError(request.Context(), E.Cause(E.Errors(err, E.Cause(fErr, "fallback connection")), "process connection from ", request.RemoteAddr))
} }

4
transport/v2raywebsocket/server.go
View file

@ -96,7 +96,7 @@ func (s *Server) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
} }
wsConn, err := upgrader.Upgrade(writer, request, nil) wsConn, err := upgrader.Upgrade(writer, request, nil)
if err != nil { if err != nil {
s.fallbackRequest(request.Context(), writer, request, http.StatusBadRequest, E.Cause(err, "upgrade websocket connection")) s.fallbackRequest(request.Context(), writer, request, 0, E.Cause(err, "upgrade websocket connection"))
return return
} }
var metadata M.Metadata var metadata M.Metadata
@ -116,7 +116,9 @@ func (s *Server) fallbackRequest(ctx context.Context, writer http.ResponseWriter
} else if fErr == os.ErrInvalid { } else if fErr == os.ErrInvalid {
fErr = nil fErr = nil
} }
if statusCode > 0 {
writer.WriteHeader(statusCode) writer.WriteHeader(statusCode)
}
s.handler.NewError(request.Context(), E.Cause(E.Errors(err, E.Cause(fErr, "fallback connection")), "process connection from ", request.RemoteAddr)) s.handler.NewError(request.Context(), E.Cause(E.Errors(err, E.Cause(fErr, "fallback connection")), "process connection from ", request.RemoteAddr))
} }