mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 21:15:50 +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
61 lines
1.4 KiB
Go
61 lines
1.4 KiB
Go
package conf
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
"github.com/xtls/xray-core/common/serial"
|
|
"github.com/xtls/xray-core/proxy/hysteria"
|
|
"github.com/xtls/xray-core/proxy/hysteria/account"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
type HysteriaClientConfig struct {
|
|
Version int32 `json:"version"`
|
|
Address *Address `json:"address"`
|
|
Port uint16 `json:"port"`
|
|
}
|
|
|
|
func (c *HysteriaClientConfig) Build() (proto.Message, error) {
|
|
if c.Version != 2 {
|
|
return nil, errors.New("version != 2")
|
|
}
|
|
|
|
config := &hysteria.ClientConfig{}
|
|
config.Version = c.Version
|
|
config.Server = &protocol.ServerEndpoint{
|
|
Address: c.Address.Build(),
|
|
Port: uint32(c.Port),
|
|
}
|
|
|
|
return config, nil
|
|
}
|
|
|
|
type HysteriaUserConfig struct {
|
|
Auth string `json:"auth"`
|
|
Level uint32 `json:"level"`
|
|
Email string `json:"email"`
|
|
}
|
|
|
|
type HysteriaServerConfig struct {
|
|
Version int32 `json:"version"`
|
|
Users []*HysteriaUserConfig `json:"clients"`
|
|
}
|
|
|
|
func (c *HysteriaServerConfig) Build() (proto.Message, error) {
|
|
config := new(hysteria.ServerConfig)
|
|
|
|
if c.Users != nil {
|
|
for _, user := range c.Users {
|
|
account := &account.Account{
|
|
Auth: user.Auth,
|
|
}
|
|
config.Users = append(config.Users, &protocol.User{
|
|
Email: user.Email,
|
|
Level: user.Level,
|
|
Account: serial.ToTypedMessage(account),
|
|
})
|
|
}
|
|
}
|
|
|
|
return config, nil
|
|
}
|