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
116 lines
2.8 KiB
Go
116 lines
2.8 KiB
Go
package mux_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/golang/mock/gomock"
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/mux"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/common/session"
|
|
"github.com/xtls/xray-core/testing/mocks"
|
|
"github.com/xtls/xray-core/transport"
|
|
"github.com/xtls/xray-core/transport/pipe"
|
|
)
|
|
|
|
func TestIncrementalPickerFailure(t *testing.T) {
|
|
mockCtl := gomock.NewController(t)
|
|
defer mockCtl.Finish()
|
|
|
|
mockWorkerFactory := mocks.NewMuxClientWorkerFactory(mockCtl)
|
|
mockWorkerFactory.EXPECT().Create().Return(nil, errors.New("test"))
|
|
|
|
picker := mux.IncrementalWorkerPicker{
|
|
Factory: mockWorkerFactory,
|
|
}
|
|
|
|
_, err := picker.PickAvailable()
|
|
if err == nil {
|
|
t.Error("expected error, but nil")
|
|
}
|
|
}
|
|
|
|
func TestClientWorkerEOF(t *testing.T) {
|
|
reader, writer := pipe.New(pipe.WithoutSizeLimit())
|
|
common.Must(writer.Close())
|
|
|
|
worker, err := mux.NewClientWorker(transport.Link{Reader: reader, Writer: writer}, mux.ClientStrategy{})
|
|
common.Must(err)
|
|
|
|
time.Sleep(time.Millisecond * 500)
|
|
|
|
f := worker.Dispatch(context.Background(), nil)
|
|
if f {
|
|
t.Error("expected failed dispatching, but actually not")
|
|
}
|
|
}
|
|
|
|
func TestClientWorkerClose(t *testing.T) {
|
|
mockCtl := gomock.NewController(t)
|
|
defer mockCtl.Finish()
|
|
|
|
r1, w1 := pipe.New(pipe.WithoutSizeLimit())
|
|
worker1, err := mux.NewClientWorker(transport.Link{
|
|
Reader: r1,
|
|
Writer: w1,
|
|
}, mux.ClientStrategy{
|
|
MaxConcurrency: 4,
|
|
MaxConnection: 4,
|
|
})
|
|
common.Must(err)
|
|
|
|
r2, w2 := pipe.New(pipe.WithoutSizeLimit())
|
|
worker2, err := mux.NewClientWorker(transport.Link{
|
|
Reader: r2,
|
|
Writer: w2,
|
|
}, mux.ClientStrategy{
|
|
MaxConcurrency: 4,
|
|
MaxConnection: 4,
|
|
})
|
|
common.Must(err)
|
|
|
|
factory := mocks.NewMuxClientWorkerFactory(mockCtl)
|
|
gomock.InOrder(
|
|
factory.EXPECT().Create().Return(worker1, nil),
|
|
factory.EXPECT().Create().Return(worker2, nil),
|
|
)
|
|
|
|
picker := &mux.IncrementalWorkerPicker{
|
|
Factory: factory,
|
|
}
|
|
manager := &mux.ClientManager{
|
|
Picker: picker,
|
|
}
|
|
|
|
tr1, tw1 := pipe.New(pipe.WithoutSizeLimit())
|
|
ctx1 := session.ContextWithOutbounds(context.Background(), []*session.Outbound{{
|
|
Target: net.TCPDestination(net.DomainAddress("www.example.com"), 80),
|
|
}})
|
|
common.Must(manager.Dispatch(ctx1, &transport.Link{
|
|
Reader: tr1,
|
|
Writer: tw1,
|
|
}))
|
|
defer tw1.Close()
|
|
|
|
common.Must(w1.Close())
|
|
|
|
time.Sleep(time.Millisecond * 500)
|
|
if !worker1.Closed() {
|
|
t.Error("worker1 is not finished")
|
|
}
|
|
|
|
tr2, tw2 := pipe.New(pipe.WithoutSizeLimit())
|
|
ctx2 := session.ContextWithOutbounds(context.Background(), []*session.Outbound{{
|
|
Target: net.TCPDestination(net.DomainAddress("www.example.com"), 80),
|
|
}})
|
|
common.Must(manager.Dispatch(ctx2, &transport.Link{
|
|
Reader: tr2,
|
|
Writer: tw2,
|
|
}))
|
|
defer tw2.Close()
|
|
|
|
common.Must(w2.Close())
|
|
}
|