mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 20:45:50 +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
56 lines
1.3 KiB
Go
56 lines
1.3 KiB
Go
package dns
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/features/dns"
|
|
"github.com/xtls/xray-core/features/routing"
|
|
)
|
|
|
|
// ResolvableContext is an implementation of routing.Context, with domain resolving capability.
|
|
type ResolvableContext struct {
|
|
routing.Context
|
|
dnsClient dns.Client
|
|
cacheIPs []net.IP
|
|
hasError bool
|
|
}
|
|
|
|
// GetTargetIPs overrides original routing.Context's implementation.
|
|
func (ctx *ResolvableContext) GetTargetIPs() []net.IP {
|
|
if len(ctx.cacheIPs) > 0 {
|
|
return ctx.cacheIPs
|
|
}
|
|
|
|
if ctx.hasError {
|
|
return nil
|
|
}
|
|
|
|
if domain := ctx.GetTargetDomain(); len(domain) != 0 {
|
|
ips, _, err := ctx.dnsClient.LookupIP(domain, dns.IPOption{
|
|
IPv4Enable: true,
|
|
IPv6Enable: true,
|
|
FakeEnable: false,
|
|
})
|
|
if err == nil {
|
|
ctx.cacheIPs = ips
|
|
return ips
|
|
}
|
|
errors.LogInfoInner(context.Background(), err, "resolve ip for ", domain)
|
|
}
|
|
|
|
if ips := ctx.Context.GetTargetIPs(); len(ips) != 0 {
|
|
ctx.cacheIPs = ips
|
|
return ips
|
|
}
|
|
|
|
ctx.hasError = true
|
|
return nil
|
|
}
|
|
|
|
// ContextWithDNSClient creates a new routing context with domain resolving capability.
|
|
// Resolved domain IPs can be retrieved by GetTargetIPs().
|
|
func ContextWithDNSClient(ctx routing.Context, client dns.Client) routing.Context {
|
|
return &ResolvableContext{Context: ctx, dnsClient: client}
|
|
}
|