mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 13:05:57 +00:00
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
194 lines
5.3 KiB
Go
194 lines
5.3 KiB
Go
package conf
|
|
|
|
import (
|
|
"encoding/json"
|
|
"path/filepath"
|
|
"runtime"
|
|
"strconv"
|
|
"strings"
|
|
"syscall"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"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/proxy/trojan"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
// TrojanServerTarget is configuration of a single trojan server
|
|
type TrojanServerTarget struct {
|
|
Address *Address `json:"address"`
|
|
Port uint16 `json:"port"`
|
|
Level byte `json:"level"`
|
|
Email string `json:"email"`
|
|
Password string `json:"password"`
|
|
Flow string `json:"flow"`
|
|
}
|
|
|
|
// TrojanClientConfig is configuration of trojan servers
|
|
type TrojanClientConfig struct {
|
|
Address *Address `json:"address"`
|
|
Port uint16 `json:"port"`
|
|
Level byte `json:"level"`
|
|
Email string `json:"email"`
|
|
Password string `json:"password"`
|
|
Flow string `json:"flow"`
|
|
Servers []*TrojanServerTarget `json:"servers"`
|
|
}
|
|
|
|
// Build implements Buildable
|
|
func (c *TrojanClientConfig) Build() (proto.Message, error) {
|
|
errors.PrintNonRemovalDeprecatedFeatureWarning("Trojan (with no Flow, etc.)", "VLESS with Flow & Seed")
|
|
|
|
if c.Address != nil {
|
|
c.Servers = []*TrojanServerTarget{
|
|
{
|
|
Address: c.Address,
|
|
Port: c.Port,
|
|
Level: c.Level,
|
|
Email: c.Email,
|
|
Password: c.Password,
|
|
Flow: c.Flow,
|
|
},
|
|
}
|
|
}
|
|
if len(c.Servers) != 1 {
|
|
return nil, errors.New(`Trojan settings: "servers" should have one and only one member. Multiple endpoints in "servers" should use multiple Trojan outbounds and routing balancer instead`)
|
|
}
|
|
|
|
config := &trojan.ClientConfig{}
|
|
|
|
for _, rec := range c.Servers {
|
|
if rec.Address == nil {
|
|
return nil, errors.New("Trojan server address is not set.")
|
|
}
|
|
if rec.Port == 0 {
|
|
return nil, errors.New("Invalid Trojan port.")
|
|
}
|
|
if rec.Password == "" {
|
|
return nil, errors.New("Trojan password is not specified.")
|
|
}
|
|
if rec.Flow != "" {
|
|
return nil, errors.PrintRemovedFeatureError(`Flow for Trojan`, ``)
|
|
}
|
|
|
|
config.Server = &protocol.ServerEndpoint{
|
|
Address: rec.Address.Build(),
|
|
Port: uint32(rec.Port),
|
|
User: &protocol.User{
|
|
Level: uint32(rec.Level),
|
|
Email: rec.Email,
|
|
Account: serial.ToTypedMessage(&trojan.Account{
|
|
Password: rec.Password,
|
|
}),
|
|
},
|
|
}
|
|
|
|
break
|
|
}
|
|
|
|
return config, nil
|
|
}
|
|
|
|
// TrojanInboundFallback is fallback configuration
|
|
type TrojanInboundFallback struct {
|
|
Name string `json:"name"`
|
|
Alpn string `json:"alpn"`
|
|
Path string `json:"path"`
|
|
Type string `json:"type"`
|
|
Dest json.RawMessage `json:"dest"`
|
|
Xver uint64 `json:"xver"`
|
|
}
|
|
|
|
// TrojanUserConfig is user configuration
|
|
type TrojanUserConfig struct {
|
|
Password string `json:"password"`
|
|
Level byte `json:"level"`
|
|
Email string `json:"email"`
|
|
Flow string `json:"flow"`
|
|
}
|
|
|
|
// TrojanServerConfig is Inbound configuration
|
|
type TrojanServerConfig struct {
|
|
Clients []*TrojanUserConfig `json:"clients"`
|
|
Fallbacks []*TrojanInboundFallback `json:"fallbacks"`
|
|
}
|
|
|
|
// Build implements Buildable
|
|
func (c *TrojanServerConfig) Build() (proto.Message, error) {
|
|
errors.PrintNonRemovalDeprecatedFeatureWarning("Trojan (with no Flow, etc.)", "VLESS with Flow & Seed")
|
|
|
|
config := &trojan.ServerConfig{
|
|
Users: make([]*protocol.User, len(c.Clients)),
|
|
}
|
|
|
|
for idx, rawUser := range c.Clients {
|
|
if rawUser.Flow != "" {
|
|
return nil, errors.PrintRemovedFeatureError(`Flow for Trojan`, ``)
|
|
}
|
|
|
|
config.Users[idx] = &protocol.User{
|
|
Level: uint32(rawUser.Level),
|
|
Email: rawUser.Email,
|
|
Account: serial.ToTypedMessage(&trojan.Account{
|
|
Password: rawUser.Password,
|
|
}),
|
|
}
|
|
}
|
|
|
|
for _, fb := range c.Fallbacks {
|
|
var i uint16
|
|
var s string
|
|
if err := json.Unmarshal(fb.Dest, &i); err == nil {
|
|
s = strconv.Itoa(int(i))
|
|
} else {
|
|
_ = json.Unmarshal(fb.Dest, &s)
|
|
}
|
|
config.Fallbacks = append(config.Fallbacks, &trojan.Fallback{
|
|
Name: fb.Name,
|
|
Alpn: fb.Alpn,
|
|
Path: fb.Path,
|
|
Type: fb.Type,
|
|
Dest: s,
|
|
Xver: fb.Xver,
|
|
})
|
|
}
|
|
for _, fb := range config.Fallbacks {
|
|
/*
|
|
if fb.Alpn == "h2" && fb.Path != "" {
|
|
return nil, errors.New(`Trojan fallbacks: "alpn":"h2" doesn't support "path"`)
|
|
}
|
|
*/
|
|
if fb.Path != "" && fb.Path[0] != '/' {
|
|
return nil, errors.New(`Trojan fallbacks: "path" must be empty or start with "/"`)
|
|
}
|
|
if fb.Type == "" && fb.Dest != "" {
|
|
if fb.Dest == "serve-ws-none" {
|
|
fb.Type = "serve"
|
|
} else if filepath.IsAbs(fb.Dest) || fb.Dest[0] == '@' {
|
|
fb.Type = "unix"
|
|
if strings.HasPrefix(fb.Dest, "@@") && (runtime.GOOS == "linux" || runtime.GOOS == "android") {
|
|
fullAddr := make([]byte, len(syscall.RawSockaddrUnix{}.Path)) // may need padding to work with haproxy
|
|
copy(fullAddr, fb.Dest[1:])
|
|
fb.Dest = string(fullAddr)
|
|
}
|
|
} else {
|
|
if _, err := strconv.Atoi(fb.Dest); err == nil {
|
|
fb.Dest = "localhost:" + fb.Dest
|
|
}
|
|
if _, _, err := net.SplitHostPort(fb.Dest); err == nil {
|
|
fb.Type = "tcp"
|
|
}
|
|
}
|
|
}
|
|
if fb.Type == "" {
|
|
return nil, errors.New(`Trojan fallbacks: please fill in a valid value for every "dest"`)
|
|
}
|
|
if fb.Xver > 2 {
|
|
return nil, errors.New(`Trojan fallbacks: invalid PROXY protocol version, "xver" only accepts 0, 1, 2`)
|
|
}
|
|
}
|
|
|
|
return config, nil
|
|
}
|