mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 04:55:46 +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
35 lines
1 KiB
Go
35 lines
1 KiB
Go
package conf
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/proxy/dokodemo"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type DokodemoConfig struct {
|
|
Address *Address `json:"address"`
|
|
Port uint16 `json:"port"`
|
|
PortMap map[string]string `json:"portMap"`
|
|
Network *NetworkList `json:"network"`
|
|
FollowRedirect bool `json:"followRedirect"`
|
|
UserLevel uint32 `json:"userLevel"`
|
|
}
|
|
|
|
func (v *DokodemoConfig) Build() (proto.Message, error) {
|
|
config := new(dokodemo.Config)
|
|
if v.Address != nil {
|
|
config.Address = v.Address.Build()
|
|
}
|
|
config.Port = uint32(v.Port)
|
|
config.PortMap = v.PortMap
|
|
for _, v := range config.PortMap {
|
|
if _, _, err := net.SplitHostPort(v); err != nil {
|
|
return nil, errors.New("invalid portMap: ", v).Base(err)
|
|
}
|
|
}
|
|
config.Networks = v.Network.Build()
|
|
config.FollowRedirect = v.FollowRedirect
|
|
config.UserLevel = v.UserLevel
|
|
return config, nil
|
|
}
|