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

http: Fix proxying websocket

Browse source
This commit is contained in:
世界 2024-11-13 13:49:56 +08:00
parent 72db784fc7
commit ad36d3be6d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 115 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

61
protocol/http/handshake.go
View file

@ -4,6 +4,7 @@ import (
std_bufio "bufio"
"context"
"encoding/base64"
"io"
"net"
"net/http"
"strings"
@ -28,7 +29,6 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
if err != nil {
return E.Cause(err, "read http request")
}
if authenticator != nil {
var (
username string
@ -72,11 +72,15 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
}
if request.Method == "CONNECT" {
portStr := request.URL.Port()
if portStr == "" {
portStr = "80"
destination := M.ParseSocksaddrHostPortStr(request.URL.Hostname(), request.URL.Port())
if destination.Port == 0 {
switch request.URL.Scheme {
case "https", "wss":
destination.Port = 443
default:
destination.Port = 80
}
}
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")))
if err != nil {
return E.Cause(err, "write http response")
@ -96,8 +100,53 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
requestConn = conn
}
return handler.NewConnection(ctx, requestConn, metadata)
} else if strings.ToLower(request.Header.Get("Connection")) == "upgrade" {
destination := M.ParseSocksaddrHostPortStr(request.URL.Hostname(), request.URL.Port())
if destination.Port == 0 {
switch request.URL.Scheme {
case "https", "wss":
destination.Port = 443
default:
destination.Port = 80
}
}
metadata.Protocol = "http"
metadata.Destination = destination
serverConn, clientConn := pipe.Pipe()
go func() {
err := handler.NewConnection(ctx, clientConn, metadata)
if err != nil {
common.Close(serverConn, clientConn)
}
}()
err = request.Write(serverConn)
if err != nil {
return E.Cause(err, "http: write upgrade request")
}
if reader.Buffered() > 0 {
_, err = io.CopyN(serverConn, reader, int64(reader.Buffered()))
if err != nil {
return err
}
}
return bufio.CopyConn(ctx, conn, serverConn)
} else {
err = handleHTTPConnection(ctx, handler, conn, request, metadata)
if err != nil {
return err
}
}
}
}
func handleHTTPConnection(
ctx context.Context,
//nolint:staticcheck
handler N.TCPConnectionHandler,
conn net.Conn,
request *http.Request,
metadata M.Metadata,
) error {
keepAlive := !(request.ProtoMajor == 1 && request.ProtoMinor == 0) && strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
request.RequestURI = ""
@ -163,7 +212,7 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
if !keepAlive {
return conn.Close()
}
}
return nil
}
func removeHopByHopHeaders(header http.Header) {