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
93 lines
2.2 KiB
Go
93 lines
2.2 KiB
Go
package wireguard
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"net/netip"
|
|
"strings"
|
|
|
|
"github.com/xtls/xray-core/common"
|
|
)
|
|
|
|
func init() {
|
|
common.Must(common.RegisterConfig((*DeviceConfig)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
|
|
deviceConfig := config.(*DeviceConfig)
|
|
if deviceConfig.IsClient {
|
|
return New(ctx, deviceConfig)
|
|
} else {
|
|
return NewServer(ctx, deviceConfig)
|
|
}
|
|
}))
|
|
}
|
|
|
|
// convert endpoint string to netip.Addr
|
|
func parseEndpoints(conf *DeviceConfig) ([]netip.Addr, bool, bool, error) {
|
|
var hasIPv4, hasIPv6 bool
|
|
|
|
endpoints := make([]netip.Addr, len(conf.Endpoint))
|
|
for i, str := range conf.Endpoint {
|
|
var addr netip.Addr
|
|
if strings.Contains(str, "/") {
|
|
prefix, err := netip.ParsePrefix(str)
|
|
if err != nil {
|
|
return nil, false, false, err
|
|
}
|
|
addr = prefix.Addr()
|
|
if prefix.Bits() != addr.BitLen() {
|
|
return nil, false, false, errors.New("interface address subnet should be /32 for IPv4 and /128 for IPv6")
|
|
}
|
|
} else {
|
|
var err error
|
|
addr, err = netip.ParseAddr(str)
|
|
if err != nil {
|
|
return nil, false, false, err
|
|
}
|
|
}
|
|
endpoints[i] = addr
|
|
|
|
if addr.Is4() {
|
|
hasIPv4 = true
|
|
} else if addr.Is6() {
|
|
hasIPv6 = true
|
|
}
|
|
}
|
|
|
|
return endpoints, hasIPv4, hasIPv6, nil
|
|
}
|
|
|
|
// serialize the config into an IPC request
|
|
func createIPCRequest(conf *DeviceConfig) string {
|
|
var request strings.Builder
|
|
|
|
request.WriteString(fmt.Sprintf("private_key=%s\n", conf.SecretKey))
|
|
|
|
if !conf.IsClient {
|
|
// placeholder, we'll handle actual port listening on Xray
|
|
request.WriteString("listen_port=1337\n")
|
|
}
|
|
|
|
for _, peer := range conf.Peers {
|
|
if peer.PublicKey != "" {
|
|
request.WriteString(fmt.Sprintf("public_key=%s\n", peer.PublicKey))
|
|
}
|
|
|
|
if peer.PreSharedKey != "" {
|
|
request.WriteString(fmt.Sprintf("preshared_key=%s\n", peer.PreSharedKey))
|
|
}
|
|
|
|
if peer.Endpoint != "" {
|
|
request.WriteString(fmt.Sprintf("endpoint=%s\n", peer.Endpoint))
|
|
}
|
|
|
|
for _, ip := range peer.AllowedIps {
|
|
request.WriteString(fmt.Sprintf("allowed_ip=%s\n", ip))
|
|
}
|
|
|
|
if peer.KeepAlive != 0 {
|
|
request.WriteString(fmt.Sprintf("persistent_keepalive_interval=%d\n", peer.KeepAlive))
|
|
}
|
|
}
|
|
|
|
return request.String()[:request.Len()]
|
|
}
|