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
85 lines
1.9 KiB
Go
85 lines
1.9 KiB
Go
package conf
|
|
|
|
import (
|
|
"encoding/json"
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
)
|
|
|
|
type ConfigCreator func() interface{}
|
|
|
|
type ConfigCreatorCache map[string]ConfigCreator
|
|
|
|
func (v ConfigCreatorCache) RegisterCreator(id string, creator ConfigCreator) error {
|
|
if _, found := v[id]; found {
|
|
return errors.New(id, " already registered.").AtError()
|
|
}
|
|
|
|
v[id] = creator
|
|
return nil
|
|
}
|
|
|
|
func (v ConfigCreatorCache) CreateConfig(id string) (interface{}, error) {
|
|
creator, found := v[id]
|
|
if !found {
|
|
return nil, errors.New("unknown config id: ", id)
|
|
}
|
|
return creator(), nil
|
|
}
|
|
|
|
type JSONConfigLoader struct {
|
|
cache ConfigCreatorCache
|
|
idKey string
|
|
configKey string
|
|
}
|
|
|
|
func NewJSONConfigLoader(cache ConfigCreatorCache, idKey string, configKey string) *JSONConfigLoader {
|
|
return &JSONConfigLoader{
|
|
idKey: idKey,
|
|
configKey: configKey,
|
|
cache: cache,
|
|
}
|
|
}
|
|
|
|
func (v *JSONConfigLoader) LoadWithID(raw []byte, id string) (interface{}, error) {
|
|
id = strings.ToLower(id)
|
|
config, err := v.cache.CreateConfig(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if err := json.Unmarshal(raw, config); err != nil {
|
|
return nil, err
|
|
}
|
|
return config, nil
|
|
}
|
|
|
|
func (v *JSONConfigLoader) Load(raw []byte) (interface{}, string, error) {
|
|
var obj map[string]json.RawMessage
|
|
if err := json.Unmarshal(raw, &obj); err != nil {
|
|
return nil, "", err
|
|
}
|
|
rawID, found := obj[v.idKey]
|
|
if !found {
|
|
return nil, "", errors.New(v.idKey, " not found in JSON context").AtError()
|
|
}
|
|
var id string
|
|
if err := json.Unmarshal(rawID, &id); err != nil {
|
|
return nil, "", err
|
|
}
|
|
rawConfig := json.RawMessage(raw)
|
|
if len(v.configKey) > 0 {
|
|
configValue, found := obj[v.configKey]
|
|
if found {
|
|
rawConfig = configValue
|
|
} else {
|
|
// Default to empty json object.
|
|
rawConfig = json.RawMessage([]byte("{}"))
|
|
}
|
|
}
|
|
config, err := v.LoadWithID([]byte(rawConfig), id)
|
|
if err != nil {
|
|
return nil, id, err
|
|
}
|
|
return config, id, nil
|
|
}
|