mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-16 10:05:00 +03:00
feat(xray): update xray-core to v26.9.30 and adapt panel
Bump xtls/xray-core to b26a91de4f (v26.9.30) and the three binary pins (DockerInit.sh, release.yml Linux + Windows) in lockstep. No deleted symbols; the sing and sing-shadowsocks indirect deps drop out with the SS2022 rewrite. XDNS finalmask (#6718) replaced its string lists with objects: domains are {name, types, edns0, lenLimit, labelLimit} and client resolvers {type, settings.addr}. The loader no longer parses the old lists, so a single stored xdns mask keeps the whole core from starting. The new leaf package internal/util/maskcompat converts them: "name[:type]" becomes a domain and "name[:type]+udp://addr" a domain plus a udp resolver. A bare name maps to TXT, the type legacy clients queried by default, and each converted domain keeps the 1232-byte EDNS0 the old code always used (without it the server caps answers at 512). It runs from: - the XdnsFinalmaskObjectsFix seeder, over inbound streams, hosts, the xray template, the global sub-JSON mask and cached subscription outbounds; - inbound save (normalizeStreamSettings) and GetXrayConfig, for rows that never went through the seeder; - both link importers, since fm= from an older panel carries the lists. The finalmask form edits the object shape (every key needs a registered field, or the finalmask watch drops it on save) and lifts legacy masks on open. The udp-mask golden fixture moves to the object shape, which TestGoldenStreamFixturesBuildInXray now builds through the core. The wire format changed as well, so pre-upgrade clients need the new core. WireGuard outbound (#6771) dropped settings.domainStrategy and the remoteDNS "local" mode. The endpoint lookup now follows sockopt.domainStrategy and in-tunnel targets the outbound's targetStrategy. The old key is silently ignored, which undid the IPv4-first endpoint lookup the WARP outbound depends on (#5205), and "local" now panics the core at startup because remoteDNS goes through netip.MustParseAddr. The WireguardDomainStrategyFix seeder moves a stored family preference to both keys (a value already set wins) and turns "local" into targetStrategy; the outbound form lifts legacy rows the same way and drops its select, the WARP modal writes the new placement, and the inbound form loses a field the server never read. ValidateOutboundConfig now refuses a non-IP remoteDNS entry, which conf.Build() lets through, on template save and for outbound subscriptions. Noise finalmask items accept type "exp" (#6862), a tag expression. The form offers it for noise items only: header-custom items go through the core's PraseByteSlice, which refuses it. TUN gained autoSystemDnsToGateway (Linux) and autoSystemWfpBlockLeak (Windows). Both pass through the settings schema so a value set in JSON survives the next form save. MASQUE (inbound, outbound, transport) and the XDRIVE transport are new protocols the panel does not offer yet; their new loader refusals only cover configs the panel never generates. The FakeDNS IPv6 pool default, the SS2022 rewrite (same gRPC account; emails are now deduped case-insensitively, as the panel already does), the restored udphop interval default and the rest change no panel-facing config.
This commit is contained in:
@@ -312,6 +312,74 @@ describe('outbound-form-adapter: round-trip', () => {
|
||||
expect((unset.settings as { remoteDNS?: string[] }).remoteDNS).toBeUndefined();
|
||||
});
|
||||
|
||||
// xray-core 26.9.30 ignores wireguard's settings.domainStrategy and panics on remoteDNS
|
||||
// "local"; the endpoint lookup reads sockopt.domainStrategy, in-tunnel targets targetStrategy.
|
||||
it('wireguard lifts the removed domainStrategy and remoteDNS local where the core reads them', () => {
|
||||
const settings = {
|
||||
secretKey: 'YFVmTVCBsLxXJCe4i+jK8PgD3S6vUqfZ4Zl0JVNDfHA=',
|
||||
peers: [{ publicKey: 'pk', endpoint: 'engage.cloudflareclient.com:2408' }],
|
||||
};
|
||||
const warp = formValuesToWirePayload(
|
||||
rawOutboundToFormValues({
|
||||
protocol: 'wireguard',
|
||||
settings: { ...settings, domainStrategy: 'ForceIPv4v6' },
|
||||
}),
|
||||
);
|
||||
expect(warp.targetStrategy).toBe('ForceIPv4v6');
|
||||
expect(warp.streamSettings).toEqual({ sockopt: { domainStrategy: 'ForceIPv4v6' } });
|
||||
expect((warp.settings as Record<string, unknown>).domainStrategy).toBeUndefined();
|
||||
|
||||
const local = formValuesToWirePayload(
|
||||
rawOutboundToFormValues({
|
||||
protocol: 'wireguard',
|
||||
settings: { ...settings, remoteDNS: ['local'] },
|
||||
}),
|
||||
);
|
||||
expect(local.targetStrategy).toBe('ForceIP');
|
||||
expect((local.settings as Record<string, unknown>).remoteDNS).toBeUndefined();
|
||||
|
||||
const admin = formValuesToWirePayload(
|
||||
rawOutboundToFormValues({
|
||||
protocol: 'wireguard',
|
||||
targetStrategy: 'UseIPv6',
|
||||
streamSettings: { sockopt: { domainStrategy: 'UseIPv4' } },
|
||||
settings: { ...settings, domainStrategy: 'ForceIPv6' },
|
||||
}),
|
||||
);
|
||||
expect(admin.targetStrategy).toBe('UseIPv6');
|
||||
expect(admin.streamSettings).toEqual({ sockopt: { domainStrategy: 'UseIPv4' } });
|
||||
});
|
||||
|
||||
// The core dials a wireguard peer through its finalmask (noise "exp" was built for WARP),
|
||||
// so saving through the form must keep the masks next to sockopt instead of dropping them.
|
||||
it('wireguard keeps its finalmask on save and drops an empty one', () => {
|
||||
const settings = {
|
||||
secretKey: 'YFVmTVCBsLxXJCe4i+jK8PgD3S6vUqfZ4Zl0JVNDfHA=',
|
||||
peers: [{ publicKey: 'pk', endpoint: 'engage.cloudflareclient.com:2408' }],
|
||||
};
|
||||
const noise = {
|
||||
type: 'noise',
|
||||
settings: { noise: [{ type: 'exp', packet: '<b 0d0a0d0a><t>', delay: '1-3' }] },
|
||||
};
|
||||
const masked = formValuesToWirePayload(
|
||||
rawOutboundToFormValues({
|
||||
protocol: 'wireguard',
|
||||
settings,
|
||||
streamSettings: { sockopt: { mark: 255 }, finalmask: { tcp: [], udp: [noise] } },
|
||||
}),
|
||||
);
|
||||
expect(masked.streamSettings).toEqual({ sockopt: { mark: 255 }, finalmask: { udp: [noise] } });
|
||||
|
||||
const empty = formValuesToWirePayload(
|
||||
rawOutboundToFormValues({
|
||||
protocol: 'wireguard',
|
||||
settings,
|
||||
streamSettings: { sockopt: { mark: 255 }, finalmask: { tcp: [], udp: [] } },
|
||||
}),
|
||||
);
|
||||
expect(empty.streamSettings).toEqual({ sockopt: { mark: 255 } });
|
||||
});
|
||||
|
||||
it('dns rules normalize qType numeric strings, split domains, carry rCode', () => {
|
||||
const wire = {
|
||||
protocol: 'dns',
|
||||
|
||||
Reference in New Issue
Block a user