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
95 lines
2.4 KiB
Go
95 lines
2.4 KiB
Go
package protocol
|
|
|
|
import (
|
|
"runtime"
|
|
|
|
"github.com/xtls/xray-core/common/bitmask"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"golang.org/x/sys/cpu"
|
|
)
|
|
|
|
// RequestCommand is a custom command in a proxy request.
|
|
type RequestCommand byte
|
|
|
|
const (
|
|
RequestCommandTCP = RequestCommand(0x01)
|
|
RequestCommandUDP = RequestCommand(0x02)
|
|
RequestCommandMux = RequestCommand(0x03)
|
|
RequestCommandRvs = RequestCommand(0x04)
|
|
)
|
|
|
|
func (c RequestCommand) TransferType() TransferType {
|
|
switch c {
|
|
case RequestCommandTCP, RequestCommandMux, RequestCommandRvs:
|
|
return TransferTypeStream
|
|
case RequestCommandUDP:
|
|
return TransferTypePacket
|
|
default:
|
|
return TransferTypeStream
|
|
}
|
|
}
|
|
|
|
const (
|
|
// [DEPRECATED 2023-06] RequestOptionChunkStream indicates request payload is chunked. Each chunk consists of length, authentication and payload.
|
|
RequestOptionChunkStream bitmask.Byte = 0x01
|
|
|
|
// 0x02 legacy setting
|
|
|
|
RequestOptionChunkMasking bitmask.Byte = 0x04
|
|
|
|
RequestOptionGlobalPadding bitmask.Byte = 0x08
|
|
|
|
RequestOptionAuthenticatedLength bitmask.Byte = 0x10
|
|
)
|
|
|
|
type RequestHeader struct {
|
|
Version byte
|
|
Command RequestCommand
|
|
Option bitmask.Byte
|
|
Security SecurityType
|
|
Port net.Port
|
|
Address net.Address
|
|
User *MemoryUser
|
|
}
|
|
|
|
func (h *RequestHeader) Destination() net.Destination {
|
|
if h.Command == RequestCommandUDP {
|
|
return net.UDPDestination(h.Address, h.Port)
|
|
}
|
|
return net.TCPDestination(h.Address, h.Port)
|
|
}
|
|
|
|
const (
|
|
ResponseOptionConnectionReuse bitmask.Byte = 0x01
|
|
)
|
|
|
|
type ResponseCommand interface{}
|
|
|
|
type ResponseHeader struct {
|
|
Option bitmask.Byte
|
|
Command ResponseCommand
|
|
}
|
|
|
|
var (
|
|
// Keep in sync with crypto/tls/cipher_suites.go.
|
|
hasGCMAsmAMD64 = cpu.X86.HasAES && cpu.X86.HasPCLMULQDQ && cpu.X86.HasSSE41 && cpu.X86.HasSSSE3
|
|
hasGCMAsmARM64 = (cpu.ARM64.HasAES && cpu.ARM64.HasPMULL) || (runtime.GOOS == "darwin" && runtime.GOARCH == "arm64")
|
|
hasGCMAsmS390X = cpu.S390X.HasAES && cpu.S390X.HasAESCTR && cpu.S390X.HasGHASH
|
|
hasGCMAsmPPC64 = runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le"
|
|
|
|
HasAESGCMHardwareSupport = hasGCMAsmAMD64 || hasGCMAsmARM64 || hasGCMAsmS390X || hasGCMAsmPPC64
|
|
)
|
|
|
|
func (sc *SecurityConfig) GetSecurityType() SecurityType {
|
|
if sc == nil || sc.Type == SecurityType_AUTO {
|
|
if HasAESGCMHardwareSupport {
|
|
return SecurityType_AES128_GCM
|
|
}
|
|
return SecurityType_CHACHA20_POLY1305
|
|
}
|
|
return sc.Type
|
|
}
|
|
|
|
func isDomainTooLong(domain string) bool {
|
|
return len(domain) > 256
|
|
}
|