SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-05 04:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in HTTP server

Browse source
This commit is contained in:
世界 2024-03-02 14:25:08 +08:00
parent 6e3921083b
commit a4a9ec42c6
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/exceptions/multi.go
View file

@ -37,11 +37,14 @@ func Errors(errors ...error) error {
} }
func Expand(err error) []error { func Expand(err error) []error {
if multiErr, isMultiErr := err.(MultiError); isMultiErr { if err == nil {
return ExpandAll(multiErr.Unwrap()) return nil
} } else if multiErr, isMultiErr := err.(MultiError); isMultiErr {
return ExpandAll(common.FilterNotNil(multiErr.Unwrap()))
} else {
return []error{err} return []error{err}
} }
}
func ExpandAll(errs []error) []error { func ExpandAll(errs []error) []error {
return common.FlatMap(errs, Expand) return common.FlatMap(errs, Expand)

9
protocol/http/handshake.go
View file

@ -9,6 +9,7 @@ import (
"strings" "strings"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/atomic"
"github.com/sagernet/sing/common/auth" "github.com/sagernet/sing/common/auth"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio" "github.com/sagernet/sing/common/bufio"
@ -110,7 +111,7 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
return responseWith(request, http.StatusBadRequest).Write(conn) return responseWith(request, http.StatusBadRequest).Write(conn)
} }
var innerErr error var innerErr atomic.TypedValue[error]
if httpClient == nil { if httpClient == nil {
httpClient = &http.Client{ httpClient = &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
@ -122,7 +123,7 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
go func() { go func() {
hErr := handler.NewConnection(ctx, output, metadata) hErr := handler.NewConnection(ctx, output, metadata)
if hErr != nil { if hErr != nil {
innerErr = hErr innerErr.Store(hErr)
common.Close(input, output) common.Close(input, output)
} }
}() }()
@ -138,7 +139,7 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
response, err := httpClient.Do(request.WithContext(requestCtx)) response, err := httpClient.Do(request.WithContext(requestCtx))
if err != nil { if err != nil {
cancel() cancel()
return E.Errors(innerErr, err, responseWith(request, http.StatusBadGateway).Write(conn)) return E.Errors(innerErr.Load(), err, responseWith(request, http.StatusBadGateway).Write(conn))
} }
removeHopByHopHeaders(response.Header) removeHopByHopHeaders(response.Header)
@ -154,7 +155,7 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
err = response.Write(conn) err = response.Write(conn)
if err != nil { if err != nil {
cancel() cancel()
return E.Errors(innerErr, err) return E.Errors(innerErr.Load(), err)
} }
cancel() cancel()