mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 04:55:46 +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
105 lines
2.2 KiB
Go
105 lines
2.2 KiB
Go
package uuid // import "github.com/xtls/xray-core/common/uuid"
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/rand"
|
|
"crypto/sha1"
|
|
"encoding/hex"
|
|
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
)
|
|
|
|
var byteGroups = []int{8, 4, 4, 4, 12}
|
|
|
|
type UUID [16]byte
|
|
|
|
// String returns the string representation of this UUID.
|
|
func (u *UUID) String() string {
|
|
bytes := u.Bytes()
|
|
result := hex.EncodeToString(bytes[0 : byteGroups[0]/2])
|
|
start := byteGroups[0] / 2
|
|
for i := 1; i < len(byteGroups); i++ {
|
|
nBytes := byteGroups[i] / 2
|
|
result += "-"
|
|
result += hex.EncodeToString(bytes[start : start+nBytes])
|
|
start += nBytes
|
|
}
|
|
return result
|
|
}
|
|
|
|
// Bytes returns the bytes representation of this UUID.
|
|
func (u *UUID) Bytes() []byte {
|
|
return u[:]
|
|
}
|
|
|
|
// Equals returns true if this UUID equals another UUID by value.
|
|
func (u *UUID) Equals(another *UUID) bool {
|
|
if u == nil && another == nil {
|
|
return true
|
|
}
|
|
if u == nil || another == nil {
|
|
return false
|
|
}
|
|
return bytes.Equal(u.Bytes(), another.Bytes())
|
|
}
|
|
|
|
// New creates a UUID with random value.
|
|
func New() UUID {
|
|
var uuid UUID
|
|
common.Must2(rand.Read(uuid.Bytes()))
|
|
uuid[6] = (uuid[6] & 0x0f) | (4 << 4)
|
|
uuid[8] = (uuid[8]&(0xff>>2) | (0x02 << 6))
|
|
return uuid
|
|
}
|
|
|
|
// ParseBytes converts a UUID in byte form to object.
|
|
func ParseBytes(b []byte) (UUID, error) {
|
|
var uuid UUID
|
|
if len(b) != 16 {
|
|
return uuid, errors.New("invalid UUID: ", b)
|
|
}
|
|
copy(uuid[:], b)
|
|
return uuid, nil
|
|
}
|
|
|
|
// ParseString converts a UUID in string form to object.
|
|
func ParseString(str string) (UUID, error) {
|
|
var uuid UUID
|
|
|
|
text := []byte(str)
|
|
if l := len(text); l < 32 || l > 36 {
|
|
if l == 0 || l > 30 {
|
|
return uuid, errors.New("invalid UUID: ", str)
|
|
}
|
|
h := sha1.New()
|
|
h.Write(uuid[:])
|
|
h.Write(text)
|
|
u := h.Sum(nil)[:16]
|
|
u[6] = (u[6] & 0x0f) | (5 << 4)
|
|
u[8] = (u[8]&(0xff>>2) | (0x02 << 6))
|
|
copy(uuid[:], u)
|
|
return uuid, nil
|
|
}
|
|
|
|
b := uuid.Bytes()
|
|
|
|
for _, byteGroup := range byteGroups {
|
|
if len(text) > 0 && text[0] == '-' {
|
|
text = text[1:]
|
|
}
|
|
|
|
if len(text) < byteGroup {
|
|
return uuid, errors.New("invalid UUID: ", str)
|
|
}
|
|
|
|
if _, err := hex.Decode(b[:byteGroup/2], text[:byteGroup]); err != nil {
|
|
return uuid, err
|
|
}
|
|
|
|
text = text[byteGroup:]
|
|
b = b[byteGroup/2:]
|
|
}
|
|
|
|
return uuid, nil
|
|
}
|