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
50 lines
1.6 KiB
Go
50 lines
1.6 KiB
Go
package conf
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/app/commander"
|
|
loggerservice "github.com/xtls/xray-core/app/log/command"
|
|
observatoryservice "github.com/xtls/xray-core/app/observatory/command"
|
|
handlerservice "github.com/xtls/xray-core/app/proxyman/command"
|
|
routerservice "github.com/xtls/xray-core/app/router/command"
|
|
statsservice "github.com/xtls/xray-core/app/stats/command"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/serial"
|
|
)
|
|
|
|
type APIConfig struct {
|
|
Tag string `json:"tag"`
|
|
Listen string `json:"listen"`
|
|
Services []string `json:"services"`
|
|
}
|
|
|
|
func (c *APIConfig) Build() (*commander.Config, error) {
|
|
if c.Tag == "" {
|
|
return nil, errors.New("API tag can't be empty.")
|
|
}
|
|
|
|
services := make([]*serial.TypedMessage, 0, 16)
|
|
for _, s := range c.Services {
|
|
switch strings.ToLower(s) {
|
|
case "reflectionservice":
|
|
services = append(services, serial.ToTypedMessage(&commander.ReflectionConfig{}))
|
|
case "handlerservice":
|
|
services = append(services, serial.ToTypedMessage(&handlerservice.Config{}))
|
|
case "loggerservice":
|
|
services = append(services, serial.ToTypedMessage(&loggerservice.Config{}))
|
|
case "statsservice":
|
|
services = append(services, serial.ToTypedMessage(&statsservice.Config{}))
|
|
case "observatoryservice":
|
|
services = append(services, serial.ToTypedMessage(&observatoryservice.Config{}))
|
|
case "routingservice":
|
|
services = append(services, serial.ToTypedMessage(&routerservice.Config{}))
|
|
}
|
|
}
|
|
|
|
return &commander.Config{
|
|
Tag: c.Tag,
|
|
Listen: c.Listen,
|
|
Service: services,
|
|
}, nil
|
|
}
|