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
51 lines
1.2 KiB
Go
51 lines
1.2 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"
|
|
)
|
|
|
|
type FakeDNSServer struct {
|
|
fakeDNSEngine dns.FakeDNSEngine
|
|
}
|
|
|
|
func NewFakeDNSServer(fd dns.FakeDNSEngine) *FakeDNSServer {
|
|
return &FakeDNSServer{fakeDNSEngine: fd}
|
|
}
|
|
|
|
func (FakeDNSServer) Name() string {
|
|
return "FakeDNS"
|
|
}
|
|
|
|
// IsDisableCache implements Server.
|
|
func (s *FakeDNSServer) IsDisableCache() bool {
|
|
return true
|
|
}
|
|
|
|
func (f *FakeDNSServer) QueryIP(ctx context.Context, domain string, opt dns.IPOption) ([]net.IP, uint32, error) {
|
|
if f.fakeDNSEngine == nil {
|
|
return nil, 0, errors.New("Unable to locate a fake DNS Engine").AtError()
|
|
}
|
|
|
|
var ips []net.Address
|
|
if fkr0, ok := f.fakeDNSEngine.(dns.FakeDNSEngineRev0); ok {
|
|
ips = fkr0.GetFakeIPForDomain3(domain, opt.IPv4Enable, opt.IPv6Enable)
|
|
} else {
|
|
ips = f.fakeDNSEngine.GetFakeIPForDomain(domain)
|
|
}
|
|
|
|
netIP, err := toNetIP(ips)
|
|
if err != nil {
|
|
return nil, 0, errors.New("Unable to convert IP to net ip").Base(err).AtError()
|
|
}
|
|
|
|
errors.LogInfo(ctx, f.Name(), " got answer: ", domain, " -> ", ips)
|
|
|
|
if len(netIP) > 0 {
|
|
return netIP, 1, nil // fakeIP ttl is 1
|
|
}
|
|
return nil, 0, dns.ErrEmptyResponse
|
|
}
|