mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 12:35:54 +00:00
367152556a
1. **Fixed XPadding Placement Dropdown**: - Added the missing `cookie` and `query` options to `xPaddingPlacement` (`stream_xhttp.html`). - *Why:* Previously, users wanting `cookie` obfuscation were forced to use the `header` placement string. This caused Xray-core to blindly intercept the entire monolithic HTTP Cookie header, failing internal padding-length validations and causing the inbound to silently drop the connection. 2. **Fixed Uplink Data Placement Validation**: - Replaced the unsupported `query` option with `cookie` in `uplinkDataPlacement`. - *Why:* Xray-core's `transport_internet.go` explicitly forbids `query` as an uplink placement option. Selecting it from the UI previously sent a payload that would cause Xray-core to instantly throw an `unsupported uplink data placement: query` panic. Adding `cookie` perfectly aligns the UI with Xray-core restrictions. ### Related Issues - Resolves #3992
106 lines
2.4 KiB
Go
106 lines
2.4 KiB
Go
package singbridge
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
B "github.com/sagernet/sing/common/buf"
|
|
"github.com/sagernet/sing/common/bufio"
|
|
M "github.com/sagernet/sing/common/metadata"
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/buf"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/transport"
|
|
)
|
|
|
|
func CopyPacketConn(ctx context.Context, inboundConn net.Conn, link *transport.Link, destination net.Destination, serverConn net.PacketConn) error {
|
|
conn := &PacketConnWrapper{
|
|
Reader: link.Reader,
|
|
Writer: link.Writer,
|
|
Dest: destination,
|
|
Conn: inboundConn,
|
|
}
|
|
return ReturnError(bufio.CopyPacketConn(ctx, conn, bufio.NewPacketConn(serverConn)))
|
|
}
|
|
|
|
type PacketConnWrapper struct {
|
|
buf.Reader
|
|
buf.Writer
|
|
net.Conn
|
|
Dest net.Destination
|
|
cached buf.MultiBuffer
|
|
}
|
|
|
|
// This ReadPacket implemented a timeout to avoid goroutine leak like PipeConnWrapper.Read()
|
|
// as a temporarily solution
|
|
func (w *PacketConnWrapper) ReadPacket(buffer *B.Buffer) (M.Socksaddr, error) {
|
|
if w.cached != nil {
|
|
mb, bb := buf.SplitFirst(w.cached)
|
|
if bb == nil {
|
|
w.cached = nil
|
|
} else {
|
|
buffer.Write(bb.Bytes())
|
|
w.cached = mb
|
|
var destination net.Destination
|
|
if bb.UDP != nil {
|
|
destination = *bb.UDP
|
|
} else {
|
|
destination = w.Dest
|
|
}
|
|
bb.Release()
|
|
return ToSocksaddr(destination), nil
|
|
}
|
|
}
|
|
|
|
// timeout
|
|
type readResult struct {
|
|
mb buf.MultiBuffer
|
|
err error
|
|
}
|
|
c := make(chan readResult, 1)
|
|
go func() {
|
|
mb, err := w.ReadMultiBuffer()
|
|
c <- readResult{mb: mb, err: err}
|
|
}()
|
|
var mb buf.MultiBuffer
|
|
select {
|
|
case <-time.After(60 * time.Second):
|
|
common.Close(w.Reader)
|
|
common.Interrupt(w.Reader)
|
|
return M.Socksaddr{}, buf.ErrReadTimeout
|
|
case result := <-c:
|
|
if result.err != nil {
|
|
return M.Socksaddr{}, result.err
|
|
}
|
|
mb = result.mb
|
|
}
|
|
|
|
nb, bb := buf.SplitFirst(mb)
|
|
if bb == nil {
|
|
return M.Socksaddr{}, nil
|
|
} else {
|
|
buffer.Write(bb.Bytes())
|
|
w.cached = nb
|
|
var destination net.Destination
|
|
if bb.UDP != nil {
|
|
destination = *bb.UDP
|
|
} else {
|
|
destination = w.Dest
|
|
}
|
|
bb.Release()
|
|
return ToSocksaddr(destination), nil
|
|
}
|
|
}
|
|
|
|
func (w *PacketConnWrapper) WritePacket(buffer *B.Buffer, destination M.Socksaddr) error {
|
|
vBuf := buf.New()
|
|
vBuf.Write(buffer.Bytes())
|
|
endpoint := ToDestination(destination, net.Network_UDP)
|
|
vBuf.UDP = &endpoint
|
|
return w.Writer.WriteMultiBuffer(buf.MultiBuffer{vBuf})
|
|
}
|
|
|
|
func (w *PacketConnWrapper) Close() error {
|
|
buf.ReleaseMulti(w.cached)
|
|
return nil
|
|
}
|