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
56 lines
1.1 KiB
Go
56 lines
1.1 KiB
Go
package conf
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/app/reverse"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type BridgeConfig struct {
|
|
Tag string `json:"tag"`
|
|
Domain string `json:"domain"`
|
|
}
|
|
|
|
func (c *BridgeConfig) Build() (*reverse.BridgeConfig, error) {
|
|
return &reverse.BridgeConfig{
|
|
Tag: c.Tag,
|
|
Domain: c.Domain,
|
|
}, nil
|
|
}
|
|
|
|
type PortalConfig struct {
|
|
Tag string `json:"tag"`
|
|
Domain string `json:"domain"`
|
|
}
|
|
|
|
func (c *PortalConfig) Build() (*reverse.PortalConfig, error) {
|
|
return &reverse.PortalConfig{
|
|
Tag: c.Tag,
|
|
Domain: c.Domain,
|
|
}, nil
|
|
}
|
|
|
|
type ReverseConfig struct {
|
|
Bridges []BridgeConfig `json:"bridges"`
|
|
Portals []PortalConfig `json:"portals"`
|
|
}
|
|
|
|
func (c *ReverseConfig) Build() (proto.Message, error) {
|
|
config := &reverse.Config{}
|
|
for _, bconfig := range c.Bridges {
|
|
b, err := bconfig.Build()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
config.BridgeConfig = append(config.BridgeConfig, b)
|
|
}
|
|
|
|
for _, pconfig := range c.Portals {
|
|
p, err := pconfig.Build()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
config.PortalConfig = append(config.PortalConfig, p)
|
|
}
|
|
|
|
return config, nil
|
|
}
|