Fixed x-forwarded-for server crash
Ylian Saint-Hilaire committed
Jun 8, 2020 at 09:45 UTC
f4a6033fff1dcefb5f6725664054d12fa14fd949
2 files changed
+3
-3
agents/MeshCentralRouter.exe
Binary files a/agents/MeshCentralRouter.exe and b/agents/MeshCentralRouter.exe differ
webserver.js
+3
-3
@@ -4187,9 +4187,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
4187
) {
4188
if (req.headers['cf-connecting-ip']) { // Use CloudFlare IP address if present
4189
req.clientIp = req.headers['cf-connecting-ip'].split(',')[0].trim();
4190
- } else if (res.headers['x-forwarded-for']) {
4190
+ } else if (req.headers['x-forwarded-for']) {
4191
req.clientIp = req.headers['x-forwarded-for'].split(',')[0].trim();
4192
- } else if (res.headers['x-real-ip']) {
4192
+ } else if (req.headers['x-real-ip']) {
4193
req.clientIp = req.headers['x-real-ip'].split(',')[0].trim();
4194
} else {
4195
req.clientIp = ipex;
@@ -4229,7 +4229,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
4229
if ((domain != null) && (domain.share != null)) {
4230
var rpath;
4231
if (domain.dns == null) { rpath = req.url.split('/'); rpath.splice(1, 1); rpath = rpath.join('/'); } else { rpath = req.url; }
4232
- if ((res.headers != null) && (res.headers.upgrade)) {
4232
+ if ((req.headers != null) && (req.headers.upgrade)) {
4233
// If this is a websocket, stop here.
4234
res.sendStatus(404);
4235
} else {