mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 13:05:57 +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
113 lines
2.3 KiB
Go
113 lines
2.3 KiB
Go
package conf_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
"github.com/xtls/xray-core/common/serial"
|
|
. "github.com/xtls/xray-core/infra/conf"
|
|
"github.com/xtls/xray-core/proxy/socks"
|
|
)
|
|
|
|
func TestSocksInboundConfig(t *testing.T) {
|
|
creator := func() Buildable {
|
|
return new(SocksServerConfig)
|
|
}
|
|
|
|
runMultiTestCase(t, []TestCase{
|
|
{
|
|
Input: `{
|
|
"auth": "password",
|
|
"accounts": [
|
|
{
|
|
"user": "my-username",
|
|
"pass": "my-password"
|
|
}
|
|
],
|
|
"udp": false,
|
|
"ip": "127.0.0.1",
|
|
"userLevel": 1
|
|
}`,
|
|
Parser: loadJSON(creator),
|
|
Output: &socks.ServerConfig{
|
|
AuthType: socks.AuthType_PASSWORD,
|
|
Accounts: map[string]string{
|
|
"my-username": "my-password",
|
|
},
|
|
UdpEnabled: false,
|
|
Address: &net.IPOrDomain{
|
|
Address: &net.IPOrDomain_Ip{
|
|
Ip: []byte{127, 0, 0, 1},
|
|
},
|
|
},
|
|
UserLevel: 1,
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func TestSocksOutboundConfig(t *testing.T) {
|
|
creator := func() Buildable {
|
|
return new(SocksClientConfig)
|
|
}
|
|
|
|
runMultiTestCase(t, []TestCase{
|
|
{
|
|
Input: `{
|
|
"servers": [{
|
|
"address": "127.0.0.1",
|
|
"port": 1234,
|
|
"users": [
|
|
{"user": "test user", "pass": "test pass", "email": "test@email.com"}
|
|
]
|
|
}]
|
|
}`,
|
|
Parser: loadJSON(creator),
|
|
Output: &socks.ClientConfig{
|
|
Server: &protocol.ServerEndpoint{
|
|
Address: &net.IPOrDomain{
|
|
Address: &net.IPOrDomain_Ip{
|
|
Ip: []byte{127, 0, 0, 1},
|
|
},
|
|
},
|
|
Port: 1234,
|
|
User: &protocol.User{
|
|
Email: "test@email.com",
|
|
Account: serial.ToTypedMessage(&socks.Account{
|
|
Username: "test user",
|
|
Password: "test pass",
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Input: `{
|
|
"address": "127.0.0.1",
|
|
"port": 1234,
|
|
"user": "test user",
|
|
"pass": "test pass",
|
|
"email": "test@email.com"
|
|
}`,
|
|
Parser: loadJSON(creator),
|
|
Output: &socks.ClientConfig{
|
|
Server: &protocol.ServerEndpoint{
|
|
Address: &net.IPOrDomain{
|
|
Address: &net.IPOrDomain_Ip{
|
|
Ip: []byte{127, 0, 0, 1},
|
|
},
|
|
},
|
|
Port: 1234,
|
|
User: &protocol.User{
|
|
Email: "test@email.com",
|
|
Account: serial.ToTypedMessage(&socks.Account{
|
|
Username: "test user",
|
|
Password: "test pass",
|
|
}),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
}
|