SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 03:47:38 +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 cc7e630923
commit c432befd02
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 51 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

62
protocol/http/handshake.go
View file

@ -4,6 +4,7 @@ import (
std_bufio "bufio" std_bufio "bufio"
"context" "context"
"encoding/base64" "encoding/base64"
"io"
"net" "net"
"net/http" "net/http"
"strings" "strings"
@ -37,7 +38,6 @@ func HandleConnectionEx(ctx context.Context, conn net.Conn, reader *std_bufio.Re
if err != nil { if err != nil {
return E.Cause(err, "read http request") return E.Cause(err, "read http request")
} }
if authenticator != nil { if authenticator != nil {
var ( var (
username string username string
@ -81,11 +81,15 @@ func HandleConnectionEx(ctx context.Context, conn net.Conn, reader *std_bufio.Re
} }
if request.Method == "CONNECT" { if request.Method == "CONNECT" {
portStr := request.URL.Port() destination := M.ParseSocksaddrHostPortStr(request.URL.Hostname(), request.URL.Port())
if portStr == "" { if destination.Port == 0 {
portStr = "80" 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"))) _, 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")
@ -108,11 +112,48 @@ func HandleConnectionEx(ctx context.Context, conn net.Conn, reader *std_bufio.Re
handlerEx.NewConnectionEx(ctx, requestConn, source, destination, onClose) handlerEx.NewConnectionEx(ctx, requestConn, source, destination, onClose)
return nil return nil
} }
} } else if strings.ToLower(request.Header.Get("Connection")) == "upgrade" {
destination := M.ParseSocksaddrHostPortStr(request.URL.Hostname(), request.URL.Port())
err = handleHTTPConnection(ctx, handler, handlerEx, conn, request, source) if destination.Port == 0 {
if err != nil { switch request.URL.Scheme {
return err case "https", "wss":
destination.Port = 443
default:
destination.Port = 80
}
}
serverConn, clientConn := pipe.Pipe()
go func() {
if handler != nil {
//nolint:staticcheck
err := handler.NewConnection(ctx, clientConn, M.Metadata{Protocol: "http", Source: source, Destination: destination})
if err != nil {
common.Close(serverConn, clientConn)
}
} else {
handlerEx.NewConnectionEx(ctx, clientConn, source, destination, func(it error) {
if it != 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, handlerEx, conn, request, source)
if err != nil {
return err
}
} }
} }
} }
@ -198,7 +239,6 @@ func handleHTTPConnection(
if !keepAlive { if !keepAlive {
return conn.Close() return conn.Close()
} }
return nil return nil
} }