mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 20:45:50 +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
50 lines
1.4 KiB
Go
50 lines
1.4 KiB
Go
package singbridge
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
|
|
M "github.com/sagernet/sing/common/metadata"
|
|
N "github.com/sagernet/sing/common/network"
|
|
"github.com/xtls/xray-core/common/buf"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/features/routing"
|
|
"github.com/xtls/xray-core/transport"
|
|
)
|
|
|
|
var (
|
|
_ N.TCPConnectionHandler = (*Dispatcher)(nil)
|
|
_ N.UDPConnectionHandler = (*Dispatcher)(nil)
|
|
)
|
|
|
|
type Dispatcher struct {
|
|
upstream routing.Dispatcher
|
|
newErrorFunc func(values ...any) *errors.Error
|
|
}
|
|
|
|
func NewDispatcher(dispatcher routing.Dispatcher, newErrorFunc func(values ...any) *errors.Error) *Dispatcher {
|
|
return &Dispatcher{
|
|
upstream: dispatcher,
|
|
newErrorFunc: newErrorFunc,
|
|
}
|
|
}
|
|
|
|
func (d *Dispatcher) NewConnection(ctx context.Context, conn net.Conn, metadata M.Metadata) error {
|
|
xConn := NewConn(conn)
|
|
return d.upstream.DispatchLink(ctx, ToDestination(metadata.Destination, net.Network_TCP), &transport.Link{
|
|
Reader: xConn,
|
|
Writer: xConn,
|
|
})
|
|
}
|
|
|
|
func (d *Dispatcher) NewPacketConnection(ctx context.Context, conn N.PacketConn, metadata M.Metadata) error {
|
|
return d.upstream.DispatchLink(ctx, ToDestination(metadata.Destination, net.Network_UDP), &transport.Link{
|
|
Reader: buf.NewPacketReader(conn.(io.Reader)),
|
|
Writer: buf.NewWriter(conn.(io.Writer)),
|
|
})
|
|
}
|
|
|
|
func (d *Dispatcher) NewError(ctx context.Context, err error) {
|
|
errors.LogInfo(ctx, err.Error())
|
|
}
|