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
51 lines
1.2 KiB
Go
51 lines
1.2 KiB
Go
package conf
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/serial"
|
|
"github.com/xtls/xray-core/proxy/blackhole"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type NoneResponse struct{}
|
|
|
|
func (*NoneResponse) Build() (proto.Message, error) {
|
|
return new(blackhole.NoneResponse), nil
|
|
}
|
|
|
|
type HTTPResponse struct{}
|
|
|
|
func (*HTTPResponse) Build() (proto.Message, error) {
|
|
return new(blackhole.HTTPResponse), nil
|
|
}
|
|
|
|
type BlackholeConfig struct {
|
|
Response json.RawMessage `json:"response"`
|
|
}
|
|
|
|
func (v *BlackholeConfig) Build() (proto.Message, error) {
|
|
config := new(blackhole.Config)
|
|
if v.Response != nil {
|
|
response, _, err := configLoader.Load(v.Response)
|
|
if err != nil {
|
|
return nil, errors.New("Config: Failed to parse Blackhole response config.").Base(err)
|
|
}
|
|
responseSettings, err := response.(Buildable).Build()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
config.Response = serial.ToTypedMessage(responseSettings)
|
|
}
|
|
|
|
return config, nil
|
|
}
|
|
|
|
var configLoader = NewJSONConfigLoader(
|
|
ConfigCreatorCache{
|
|
"none": func() interface{} { return new(NoneResponse) },
|
|
"http": func() interface{} { return new(HTTPResponse) },
|
|
},
|
|
"type",
|
|
"")
|