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

Fix "Fix HTTP server leak"

Browse source
This commit is contained in:
世界 2023-11-24 19:45:43 +08:00
parent 5b9d6eba38
commit e50e7ae2d3
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
protocol/http/handshake.go
View file

@ -21,6 +21,7 @@ import (
type Handler = N.TCPConnectionHandler type Handler = N.TCPConnectionHandler
func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Reader, authenticator auth.Authenticator, handler Handler, metadata M.Metadata) error { func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Reader, authenticator auth.Authenticator, handler Handler, metadata M.Metadata) error {
var httpClient *http.Client
for { for {
request, err := ReadRequest(reader) request, err := ReadRequest(reader)
if err != nil { if err != nil {
@ -94,30 +95,33 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
} }
var innerErr error var innerErr error
httpClient := &http.Client{ if httpClient == nil {
Transport: &http.Transport{ httpClient = &http.Client{
DisableCompression: true, Transport: &http.Transport{
DialContext: func(context context.Context, network, address string) (net.Conn, error) { DisableCompression: true,
metadata.Destination = M.ParseSocksaddr(address) DialContext: func(context context.Context, network, address string) (net.Conn, error) {
metadata.Protocol = "http" metadata.Destination = M.ParseSocksaddr(address)
input, output := net.Pipe() metadata.Protocol = "http"
go func() { input, output := net.Pipe()
hErr := handler.NewConnection(ctx, output, metadata) go func() {
if hErr != nil { hErr := handler.NewConnection(ctx, output, metadata)
innerErr = hErr if hErr != nil {
common.Close(input, output) innerErr = hErr
} common.Close(input, output)
}() }
return input, nil }()
return input, nil
},
}, },
}, CheckRedirect: func(req *http.Request, via []*http.Request) error {
CheckRedirect: func(req *http.Request, via []*http.Request) error { return http.ErrUseLastResponse
return http.ErrUseLastResponse },
}, }
} }
requestCtx, cancel := context.WithCancel(ctx)
response, err := httpClient.Do(request) response, err := httpClient.Do(request.WithContext(requestCtx))
if err != nil { if err != nil {
cancel()
return E.Errors(innerErr, err, responseWith(request, http.StatusBadGateway).Write(conn)) return E.Errors(innerErr, err, responseWith(request, http.StatusBadGateway).Write(conn))
} }
@ -133,10 +137,11 @@ 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()
return E.Errors(innerErr, err) return E.Errors(innerErr, err)
} }
httpClient.CloseIdleConnections() cancel()
if !keepAlive { if !keepAlive {
return conn.Close() return conn.Close()