xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-07-17 10:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(panel): use the hosting node address for WireGuard client configs (#5679)

Browse Source 
* fix(panel): use the hosting node address for WireGuard client configs

The clients page rendered a node-managed WireGuard inbound's config with the
master panel's host in Endpoint instead of the hosting node's address, so the
copied/QR config pointed at the wrong server. The subscription path already
resolves this via resolveInboundAddress; the UI generator did not.

Expose the share-host resolution inputs (node address, listen, share-address
strategy/address) on InboundOption and route buildWireguardClientConfig through
the same canonical resolver the inbounds-page share links use, extracted as
resolveShareHost. This also brings local inbounds with a shareable listen or a
listen/custom share strategy into parity with the subscription Endpoint; the
common listen=0.0.0.0 case still falls back to the panel host.

* fix(frontend): keep a raw fallback host and refresh node-fed inbound options

Code review of the WireGuard node-endpoint change surfaced two gaps.
resolveShareHost normalized its last-resort fallbackHostname, so a panel
reached via a hostname the share-host grammar rejects (underscore label,
trailing-dot FQDN) emitted a broken 'Endpoint = :51820'; the fallback now
stays verbatim when normalization empties it. Node mutations only
invalidated the nodes query, leaving the staleTime-Infinity inbound
options cache serving an edited node address until the sync job
broadcast (never, for disabled/offline nodes); they now invalidate the
options key too.

Also folds the ShareHostFields projections into direct structural passes,
elides the default node shareAddrStrategy so omitempty drops it, and
replaces the nullable node-address scan with COALESCE.

---------

Co-authored-by: STRENCH0 <17428017+STRENCH0@users.noreply.github.com>
Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
Grigoriy
2026-07-03 02:12:32 +03:00
committed by GitHub
parent dbdecda03f
commit f90e4a6962
12 changed files with 267 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/test/wireguard-client-config.test.ts
+37
View File
@@ -52,4 +52,41 @@ describe('buildWireguardClientConfig', () => {
const cfg = buildWireguardClientConfig({ ...client, preSharedKey: undefined }, inbound, 'example.com', '');
expect(cfg).not.toContain('PresharedKey');
});
it('uses the hosting node address as the endpoint host for node-managed inbounds', () => {
const cfg = buildWireguardClientConfig(client, { ...inbound, nodeAddress: 'node.example.net' }, 'master.example.com', '');
expect(cfg).toContain('Endpoint = node.example.net:51820');
expect(cfg).not.toContain('master.example.com');
});
it('falls back to the panel host when the node address is blank', () => {
const cfg = buildWireguardClientConfig(client, { ...inbound, nodeAddress: ' ' }, 'master.example.com', '');
expect(cfg).toContain('Endpoint = master.example.com:51820');
});
it('honors the custom share-address strategy over the node address', () => {
const cfg = buildWireguardClientConfig(
client,
{ ...inbound, nodeAddress: 'node.example.net', shareAddrStrategy: 'custom', shareAddr: 'vpn.example.com' },
'master.example.com',
'',
);
expect(cfg).toContain('Endpoint = vpn.example.com:51820');
});
it('honors the listen share-address strategy over the node address', () => {
const cfg = buildWireguardClientConfig(
client,
{ ...inbound, nodeAddress: 'node.example.net', shareAddrStrategy: 'listen', listen: '198.51.100.7' },
'master.example.com',
'',
);
expect(cfg).toContain('Endpoint = 198.51.100.7:51820');
});
it('keeps a panel hostname that fails share-host normalization instead of emitting an empty endpoint', () => {
const cfg = buildWireguardClientConfig(client, { ...inbound, listen: '0.0.0.0' }, 'wg_gw.corp.lan', '');
expect(cfg).toContain('Endpoint = wg_gw.corp.lan:51820');
expect(cfg).not.toContain('Endpoint = :51820');
});
});