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 http handler

Browse source
This commit is contained in:
世界 2022-06-30 21:21:01 +08:00
parent 63a57e6e12
commit 9076aa005b
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
protocol/http/handshake.go
View file

@ -21,29 +21,14 @@ import (
type Handler = N.TCPConnectionHandler type Handler = N.TCPConnectionHandler
func HandleConnection(ctx context.Context, conn net.Conn, 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 {
reader := std_bufio.NewReader(conn)
request, err := http.ReadRequest(reader)
if err != nil {
return E.Cause(err, "read http request")
}
if reader.Buffered() > 0 {
_buffer := buf.StackNewSize(reader.Buffered())
defer common.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
defer buffer.Release()
_, err = buffer.ReadFullFrom(reader, reader.Buffered())
if err != nil {
return err
}
conn = bufio.NewCachedConn(conn, buffer)
}
return HandleRequest(ctx, request, conn, authenticator, handler, metadata)
}
func HandleRequest(ctx context.Context, request *http.Request, conn net.Conn, authenticator auth.Authenticator, handler Handler, metadata M.Metadata) error {
var httpClient *http.Client var httpClient *http.Client
for { for {
request, err := ReadRequest(reader)
if err != nil {
return E.Cause(err, "read http request")
}
if authenticator != nil { if authenticator != nil {
var authOk bool var authOk bool
authorization := request.Header.Get("Proxy-Authorization") authorization := request.Header.Get("Proxy-Authorization")
@ -53,26 +38,41 @@ func HandleRequest(ctx context.Context, request *http.Request, conn net.Conn, au
authOk = authenticator.Verify(userPswdArr[0], userPswdArr[1]) authOk = authenticator.Verify(userPswdArr[0], userPswdArr[1])
} }
if !authOk { if !authOk {
err := responseWith(request, http.StatusProxyAuthRequired).Write(conn) err = responseWith(request, http.StatusProxyAuthRequired).Write(conn)
if err != nil { if err != nil {
return err return err
} }
} }
} }
var requestConn net.Conn
if reader.Buffered() > 0 {
_buffer := buf.StackNewSize(reader.Buffered())
defer common.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
defer buffer.Release()
_, err = buffer.ReadFullFrom(reader, reader.Buffered())
if err != nil {
return err
}
requestConn = bufio.NewCachedConn(conn, buffer)
} else {
requestConn = conn
}
if request.Method == "CONNECT" { if request.Method == "CONNECT" {
portStr := request.URL.Port() portStr := request.URL.Port()
if portStr == "" { if portStr == "" {
portStr = "80" portStr = "80"
} }
destination := M.ParseSocksaddrHostPortStr(request.URL.Hostname(), portStr) destination := M.ParseSocksaddrHostPortStr(request.URL.Hostname(), portStr)
_, err := conn.Write([]byte(F.ToString("HTTP/", request.ProtoMajor, ".", request.ProtoMinor, " 200 Connection established\r\n\r\n"))) _, err = conn.Write([]byte(F.ToString("HTTP/", request.ProtoMajor, ".", request.ProtoMinor, " 200 Connection established\r\n\r\n")))
if err != nil { if err != nil {
return E.Cause(err, "write http response") return E.Cause(err, "write http response")
} }
metadata.Protocol = "http" metadata.Protocol = "http"
metadata.Destination = destination metadata.Destination = destination
return handler.NewConnection(ctx, conn, metadata) return handler.NewConnection(ctx, requestConn, metadata)
} }
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive" keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"