SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 20:07:38 +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
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 {
request, err := ReadRequest(reader)
if err != nil {
@ -94,30 +95,33 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
}
var innerErr error
httpClient := &http.Client{
Transport: &http.Transport{
DisableCompression: true,
DialContext: func(context context.Context, network, address string) (net.Conn, error) {
metadata.Destination = M.ParseSocksaddr(address)
metadata.Protocol = "http"
input, output := net.Pipe()
go func() {
hErr := handler.NewConnection(ctx, output, metadata)
if hErr != nil {
innerErr = hErr
common.Close(input, output)
}
}()
return input, nil
if httpClient == nil {
httpClient = &http.Client{
Transport: &http.Transport{
DisableCompression: true,
DialContext: func(context context.Context, network, address string) (net.Conn, error) {
metadata.Destination = M.ParseSocksaddr(address)
metadata.Protocol = "http"
input, output := net.Pipe()
go func() {
hErr := handler.NewConnection(ctx, output, metadata)
if hErr != nil {
innerErr = hErr
common.Close(input, output)
}
}()
return input, nil
},
},
},
CheckRedirect: func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
},
CheckRedirect: func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
},
}
}
response, err := httpClient.Do(request)
requestCtx, cancel := context.WithCancel(ctx)
response, err := httpClient.Do(request.WithContext(requestCtx))
if err != nil {
cancel()
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)
if err != nil {
cancel()
return E.Errors(innerErr, err)
}
httpClient.CloseIdleConnections()
cancel()
if !keepAlive {
return conn.Close()