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
72 lines
1.3 KiB
Go
72 lines
1.3 KiB
Go
//go:build !wasm && !openbsd
|
|
// +build !wasm,!openbsd
|
|
|
|
package buf_test
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/xtls/xray-core/common"
|
|
. "github.com/xtls/xray-core/common/buf"
|
|
"github.com/xtls/xray-core/testing/servers/tcp"
|
|
"golang.org/x/sync/errgroup"
|
|
)
|
|
|
|
func TestReadvReader(t *testing.T) {
|
|
tcpServer := &tcp.Server{
|
|
MsgProcessor: func(b []byte) []byte {
|
|
return b
|
|
},
|
|
}
|
|
dest, err := tcpServer.Start()
|
|
common.Must(err)
|
|
defer tcpServer.Close()
|
|
|
|
conn, err := net.Dial("tcp", dest.NetAddr())
|
|
common.Must(err)
|
|
defer conn.Close()
|
|
|
|
const size = 8192
|
|
data := make([]byte, 8192)
|
|
common.Must2(rand.Read(data))
|
|
|
|
var errg errgroup.Group
|
|
errg.Go(func() error {
|
|
writer := NewWriter(conn)
|
|
mb := MergeBytes(nil, data)
|
|
|
|
return writer.WriteMultiBuffer(mb)
|
|
})
|
|
|
|
defer func() {
|
|
if err := errg.Wait(); err != nil {
|
|
t.Error(err)
|
|
}
|
|
}()
|
|
|
|
rawConn, err := conn.(*net.TCPConn).SyscallConn()
|
|
common.Must(err)
|
|
|
|
reader := NewReadVReader(conn, rawConn, nil)
|
|
var rmb MultiBuffer
|
|
for {
|
|
mb, err := reader.ReadMultiBuffer()
|
|
if err != nil {
|
|
t.Fatal("unexpected error: ", err)
|
|
}
|
|
rmb, _ = MergeMulti(rmb, mb)
|
|
if rmb.Len() == size {
|
|
break
|
|
}
|
|
}
|
|
|
|
rdata := make([]byte, size)
|
|
SplitBytes(rmb, rdata)
|
|
|
|
if r := cmp.Diff(data, rdata); r != "" {
|
|
t.Fatal(r)
|
|
}
|
|
}
|