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
92 lines
2.3 KiB
Go
92 lines
2.3 KiB
Go
package trojan_test
|
|
|
|
import (
|
|
"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/common/net"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
. "github.com/xtls/xray-core/proxy/trojan"
|
|
)
|
|
|
|
func toAccount(a *Account) protocol.Account {
|
|
account, err := a.AsAccount()
|
|
common.Must(err)
|
|
return account
|
|
}
|
|
|
|
func TestTCPRequest(t *testing.T) {
|
|
user := &protocol.MemoryUser{
|
|
Email: "love@example.com",
|
|
Account: toAccount(&Account{
|
|
Password: "password",
|
|
}),
|
|
}
|
|
payload := []byte("test string")
|
|
data := buf.New()
|
|
common.Must2(data.Write(payload))
|
|
|
|
buffer := buf.New()
|
|
defer buffer.Release()
|
|
|
|
destination := net.Destination{Network: net.Network_TCP, Address: net.LocalHostIP, Port: 1234}
|
|
writer := &ConnWriter{Writer: buffer, Target: destination, Account: user.Account.(*MemoryAccount)}
|
|
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{data}))
|
|
|
|
reader := &ConnReader{Reader: buffer}
|
|
common.Must(reader.ParseHeader())
|
|
|
|
if r := cmp.Diff(reader.Target, destination); r != "" {
|
|
t.Error("destination: ", r)
|
|
}
|
|
|
|
decodedData, err := reader.ReadMultiBuffer()
|
|
common.Must(err)
|
|
if r := cmp.Diff(decodedData[0].Bytes(), payload); r != "" {
|
|
t.Error("data: ", r)
|
|
}
|
|
}
|
|
|
|
func TestUDPRequest(t *testing.T) {
|
|
user := &protocol.MemoryUser{
|
|
Email: "love@example.com",
|
|
Account: toAccount(&Account{
|
|
Password: "password",
|
|
}),
|
|
}
|
|
payload := []byte("test string")
|
|
data := buf.New()
|
|
common.Must2(data.Write(payload))
|
|
|
|
buffer := buf.New()
|
|
defer buffer.Release()
|
|
|
|
destination := net.Destination{Network: net.Network_UDP, Address: net.LocalHostIP, Port: 1234}
|
|
writer := &PacketWriter{Writer: &ConnWriter{Writer: buffer, Target: destination, Account: user.Account.(*MemoryAccount)}, Target: destination}
|
|
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{data}))
|
|
|
|
connReader := &ConnReader{Reader: buffer}
|
|
common.Must(connReader.ParseHeader())
|
|
|
|
packetReader := &PacketReader{Reader: connReader}
|
|
mb, err := packetReader.ReadMultiBuffer()
|
|
common.Must(err)
|
|
|
|
if mb.IsEmpty() {
|
|
t.Error("no request data")
|
|
}
|
|
|
|
mb2, b := buf.SplitFirst(mb)
|
|
defer buf.ReleaseMulti(mb2)
|
|
|
|
dest := *b.UDP
|
|
if r := cmp.Diff(dest, destination); r != "" {
|
|
t.Error("destination: ", r)
|
|
}
|
|
|
|
if r := cmp.Diff(b.Bytes(), payload); r != "" {
|
|
t.Error("data: ", r)
|
|
}
|
|
}
|