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
67 lines
1.8 KiB
Go
67 lines
1.8 KiB
Go
package vmess
|
|
|
|
import (
|
|
"google.golang.org/protobuf/proto"
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
"github.com/xtls/xray-core/common/uuid"
|
|
)
|
|
|
|
// MemoryAccount is an in-memory form of VMess account.
|
|
type MemoryAccount struct {
|
|
// ID is the main ID of the account.
|
|
ID *protocol.ID
|
|
// Security type of the account. Used for client connections.
|
|
Security protocol.SecurityType
|
|
|
|
AuthenticatedLengthExperiment bool
|
|
NoTerminationSignal bool
|
|
}
|
|
|
|
// Equals implements protocol.Account.
|
|
func (a *MemoryAccount) Equals(account protocol.Account) bool {
|
|
vmessAccount, ok := account.(*MemoryAccount)
|
|
if !ok {
|
|
return false
|
|
}
|
|
return a.ID.Equals(vmessAccount.ID)
|
|
}
|
|
|
|
func (a *MemoryAccount) ToProto() proto.Message {
|
|
var test = ""
|
|
if a.AuthenticatedLengthExperiment {
|
|
test = "AuthenticatedLength|"
|
|
}
|
|
if a.NoTerminationSignal {
|
|
test = test + "NoTerminationSignal"
|
|
}
|
|
return &Account{
|
|
Id: a.ID.String(),
|
|
TestsEnabled: test,
|
|
SecuritySettings: &protocol.SecurityConfig{Type: a.Security},
|
|
}
|
|
}
|
|
|
|
// AsAccount implements protocol.Account.
|
|
func (a *Account) AsAccount() (protocol.Account, error) {
|
|
id, err := uuid.ParseString(a.Id)
|
|
if err != nil {
|
|
return nil, errors.New("failed to parse ID").Base(err).AtError()
|
|
}
|
|
protoID := protocol.NewID(id)
|
|
var AuthenticatedLength, NoTerminationSignal bool
|
|
if strings.Contains(a.TestsEnabled, "AuthenticatedLength") {
|
|
AuthenticatedLength = true
|
|
}
|
|
if strings.Contains(a.TestsEnabled, "NoTerminationSignal") {
|
|
NoTerminationSignal = true
|
|
}
|
|
return &MemoryAccount{
|
|
ID: protoID,
|
|
Security: a.SecuritySettings.GetSecurityType(),
|
|
AuthenticatedLengthExperiment: AuthenticatedLength,
|
|
NoTerminationSignal: NoTerminationSignal,
|
|
}, nil
|
|
}
|