external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-12 11:01:52 +00:00
Code Issues Releases Wiki Activity

Fixed x-forwarded-host where multiple hosts are specified.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-02-16 13:00:36 -08:00
parent bbb9014fcd
commit f791515546
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meshcentral.js
View file

@ -1623,8 +1623,7 @@ function CreateMeshCentralServer(config, args) {
} }
// Setup and start the legacy swarm server // Setup and start the legacy swarm server
if ((obj.certificates.swarmserver != null) && (obj.args.swarmport !== 0)) { if ((obj.certificates.swarmserver != null) && (obj.args.swarmport != null) && (obj.args.swarmport !== 0)) {
if (obj.args.swarmport == null) { obj.args.swarmport = 8080; }
obj.swarmserver = require('./swarmserver.js').CreateSwarmServer(obj, obj.db, obj.args, obj.certificates); obj.swarmserver = require('./swarmserver.js').CreateSwarmServer(obj, obj.db, obj.args, obj.certificates);
} }

2
webserver.js
View file

@ -5716,7 +5716,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
if (clientIpSplit.length == 2) { req.clientIp = clientIpSplit[0]; } if (clientIpSplit.length == 2) { req.clientIp = clientIpSplit[0]; }
// Get server host // Get server host
if (req.headers['x-forwarded-host']) { xforwardedhost = req.headers['x-forwarded-host']; } if (req.headers['x-forwarded-host']) { xforwardedhost = req.headers['x-forwarded-host'].split(',')[0]; } // If multiple hosts are specified with a comma, take the first one.
} else { } else {
req.clientIp = ipex; req.clientIp = ipex;
} }