WildDragonLLC/dragonflight
1
0
Fork 0
Code Issues 32 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(cluster): trust non-bridge ip_address from heartbeat payload

Browse source
This commit is contained in:
OpenCode 2026-06-04 22:09:10 +00:00
parent 6c1edae7f0
commit ec58556c36
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/mam-api/src/routes/cluster.js
View file

@ -43,9 +43,10 @@ function pickIp(reportedIp, reqIp) {
const clean = (s) => (s || '').replace(/^::ffff:/, ''); const clean = (s) => (s || '').replace(/^::ffff:/, '');
const isDockerBridge = (ip) => /^172\.17\./.test(ip || ''); const isDockerBridge = (ip) => /^172\.17\./.test(ip || '');
const r = clean(reqIp); const r = clean(reqIp);
if (!reportedIp) return r || null; // Trust payload ip_address when present and not docker0 bridge
if (isDockerBridge(reportedIp) && r && !isDockerBridge(r)) return r; if (reportedIp && !isDockerBridge(reportedIp)) return reportedIp;
return reportedIp; // Fall back to req.ip when payload missing or docker0
return r || null;
} }
function dockerRequest(path, method = 'GET', body = null) { function dockerRequest(path, method = 'GET', body = null) {