mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-13 09:25:14 +03:00
62423cacd1
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.
124 lines
4.3 KiB
TypeScript
124 lines
4.3 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
|
|
import { buildWarpOutbound, mergeWarpRotation } from '@/pages/xray/overrides/WarpModal';
|
|
|
|
const clientId = btoa(String.fromCharCode(1, 2, 3));
|
|
|
|
function rotatedConfig(
|
|
overrides: { public_key?: string; host?: string; v4?: string; v6?: string } = {},
|
|
) {
|
|
return {
|
|
config: {
|
|
client_id: clientId,
|
|
interface: {
|
|
addresses: { v4: overrides.v4 ?? '172.16.0.2', v6: overrides.v6 ?? '2606:4700::2' },
|
|
},
|
|
peers: [
|
|
{
|
|
public_key: overrides.public_key ?? 'newPub',
|
|
endpoint: { host: overrides.host ?? 'engage.cloudflareclient.com:2408' },
|
|
},
|
|
],
|
|
},
|
|
};
|
|
}
|
|
|
|
describe('mergeWarpRotation', () => {
|
|
it('patches only rotated fields and preserves user customizations', () => {
|
|
const existing = {
|
|
tag: 'warp',
|
|
protocol: 'wireguard',
|
|
settings: {
|
|
mtu: 1280,
|
|
secretKey: 'oldSecret',
|
|
address: ['172.16.0.2/32'],
|
|
reserved: [9, 9, 9],
|
|
domainStrategy: 'ForceIPv4',
|
|
noKernelTun: false,
|
|
peers: [
|
|
{
|
|
publicKey: 'oldPub',
|
|
endpoint: 'engage.cloudflareclient.com:2408',
|
|
keepAlive: 25,
|
|
allowedIPs: ['10.0.0.0/24'],
|
|
preSharedKey: 'psk',
|
|
},
|
|
{ publicKey: 'extraPeer', endpoint: 'extra.test:51820' },
|
|
],
|
|
},
|
|
};
|
|
|
|
const merged = mergeWarpRotation(
|
|
existing,
|
|
{ private_key: 'newSecret' },
|
|
rotatedConfig({
|
|
public_key: 'newPub',
|
|
host: 'engage.cloudflareclient.com:2408',
|
|
v4: '172.16.0.9',
|
|
}),
|
|
);
|
|
|
|
expect(merged).not.toBeNull();
|
|
const settings = (merged as { settings: Record<string, unknown> }).settings;
|
|
expect(settings.secretKey).toBe('newSecret');
|
|
expect(settings.address).toEqual(['172.16.0.9/32', '2606:4700::2/128']);
|
|
expect(settings.reserved).toEqual([1, 2, 3]);
|
|
const peers = settings.peers as Array<Record<string, unknown>>;
|
|
expect(peers[0].publicKey).toBe('newPub');
|
|
expect(peers[0].endpoint).toBe('engage.cloudflareclient.com:2408');
|
|
expect(peers[0].keepAlive).toBe(25);
|
|
expect(peers[0].allowedIPs).toEqual(['10.0.0.0/24']);
|
|
expect(peers[0].preSharedKey).toBe('psk');
|
|
expect(peers[1]).toEqual({ publicKey: 'extraPeer', endpoint: 'extra.test:51820' });
|
|
expect(settings.mtu).toBe(1280);
|
|
expect(settings.domainStrategy).toBe('ForceIPv4');
|
|
expect(settings.noKernelTun).toBe(false);
|
|
});
|
|
|
|
it('does not mutate the existing outbound object', () => {
|
|
const existing = {
|
|
tag: 'warp',
|
|
protocol: 'wireguard',
|
|
settings: {
|
|
secretKey: 'oldSecret',
|
|
address: ['172.16.0.2/32'],
|
|
reserved: [9, 9, 9],
|
|
peers: [{ publicKey: 'oldPub', endpoint: 'old:1', keepAlive: 25 }],
|
|
},
|
|
};
|
|
const snapshot = JSON.parse(JSON.stringify(existing));
|
|
|
|
mergeWarpRotation(existing, { private_key: 'newSecret' }, rotatedConfig());
|
|
|
|
expect(existing).toEqual(snapshot);
|
|
});
|
|
|
|
it('returns null when the rotation response has no peer', () => {
|
|
expect(mergeWarpRotation(undefined, null, { config: { peers: [] } })).toBeNull();
|
|
expect(mergeWarpRotation(undefined, null, null)).toBeNull();
|
|
});
|
|
|
|
it('seeds a default warp outbound when none existed yet', () => {
|
|
const merged = mergeWarpRotation(undefined, { private_key: 'newSecret' }, rotatedConfig());
|
|
expect(merged).not.toBeNull();
|
|
expect((merged as Record<string, unknown>).tag).toBe('warp');
|
|
expect((merged as Record<string, unknown>).protocol).toBe('wireguard');
|
|
const settings = (merged as { settings: Record<string, unknown> }).settings;
|
|
expect(settings.secretKey).toBe('newSecret');
|
|
expect(settings.peers).toEqual([
|
|
{ publicKey: 'newPub', endpoint: 'engage.cloudflareclient.com:2408' },
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe('buildWarpOutbound', () => {
|
|
// xray-core 26.9.30 ignores wireguard's settings.domainStrategy, so the IPv4-first
|
|
// endpoint lookup #5205 depends on has to travel in sockopt, where the core reads it.
|
|
it('places the IPv4-first strategy where xray-core reads it', () => {
|
|
const outbound = buildWarpOutbound({ private_key: 'secret' }, rotatedConfig()) ?? {};
|
|
expect(outbound.streamSettings).toEqual({ sockopt: { domainStrategy: 'ForceIPv4v6' } });
|
|
expect(outbound.targetStrategy).toBe('ForceIPv4v6');
|
|
expect(outbound.settings).not.toHaveProperty('domainStrategy');
|
|
});
|
|
});
|