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
55 lines
1.2 KiB
Go
55 lines
1.2 KiB
Go
package protocol
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/serial"
|
|
)
|
|
|
|
func (u *User) GetTypedAccount() (Account, error) {
|
|
if u.GetAccount() == nil {
|
|
return nil, errors.New("Account is missing").AtWarning()
|
|
}
|
|
|
|
rawAccount, err := u.Account.GetInstance()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if asAccount, ok := rawAccount.(AsAccount); ok {
|
|
return asAccount.AsAccount()
|
|
}
|
|
if account, ok := rawAccount.(Account); ok {
|
|
return account, nil
|
|
}
|
|
return nil, errors.New("Unknown account type: ", u.Account.Type)
|
|
}
|
|
|
|
func (u *User) ToMemoryUser() (*MemoryUser, error) {
|
|
account, err := u.GetTypedAccount()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &MemoryUser{
|
|
Account: account,
|
|
Email: u.Email,
|
|
Level: u.Level,
|
|
}, nil
|
|
}
|
|
|
|
func ToProtoUser(mu *MemoryUser) *User {
|
|
if mu == nil {
|
|
return nil
|
|
}
|
|
return &User{
|
|
Account: serial.ToTypedMessage(mu.Account.ToProto()),
|
|
Email: mu.Email,
|
|
Level: mu.Level,
|
|
}
|
|
}
|
|
|
|
// MemoryUser is a parsed form of User, to reduce number of parsing of Account proto.
|
|
type MemoryUser struct {
|
|
// Account is the parsed account of the protocol.
|
|
Account Account
|
|
Email string
|
|
Level uint32
|
|
}
|