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
57 lines
1.1 KiB
Go
57 lines
1.1 KiB
Go
package trojan
|
|
|
|
import (
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/protocol"
|
|
)
|
|
|
|
// MemoryAccount is an account type converted from Account.
|
|
type MemoryAccount struct {
|
|
Password string
|
|
Key []byte
|
|
}
|
|
|
|
// AsAccount implements protocol.AsAccount.
|
|
func (a *Account) AsAccount() (protocol.Account, error) {
|
|
password := a.GetPassword()
|
|
key := hexSha224(password)
|
|
return &MemoryAccount{
|
|
Password: password,
|
|
Key: key,
|
|
}, nil
|
|
}
|
|
|
|
// Equals implements protocol.Account.Equals().
|
|
func (a *MemoryAccount) Equals(another protocol.Account) bool {
|
|
if account, ok := another.(*MemoryAccount); ok {
|
|
return a.Password == account.Password
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (a *MemoryAccount) ToProto() proto.Message {
|
|
return &Account{
|
|
Password: a.Password,
|
|
}
|
|
}
|
|
|
|
func hexSha224(password string) []byte {
|
|
buf := make([]byte, 56)
|
|
hash := sha256.New224()
|
|
common.Must2(hash.Write([]byte(password)))
|
|
hex.Encode(buf, hash.Sum(nil))
|
|
return buf
|
|
}
|
|
|
|
func hexString(data []byte) string {
|
|
str := ""
|
|
for _, v := range data {
|
|
str += fmt.Sprintf("%02x", v)
|
|
}
|
|
return str
|
|
}
|