Fascinated/Minetrack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

print CF-Connecting-IP/X-Forwarded-For when present in socket.io requests

Browse Source
This commit is contained in:
Nick Krecklow 2020-04-01 21:54:43 -05:00
parent 1382a6a21e
commit 7e4e0390f1
No known key found for this signature in database
GPG Key ID: 5F149FDE156FFA94
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -232,7 +232,7 @@ function startServices() {
// We're good to connect them!
connectedClients += 1;
logger.log('info', '%s connected, total clients: %d', client.request.connection.remoteAddress, connectedClients);
logger.log('info', '%s connected, total clients: %d', util.getRemoteAddr(client.request), connectedClients);
// We send the boot time (also sent in publicConfig.json) to the frontend to validate they have the same config.
// If so, they'll send back "requestListing" event, otherwise they will pull the new config and retry.
@ -242,7 +242,7 @@ function startServices() {
client.on('disconnect', function() {
connectedClients -= 1;
logger.log('info', '%s disconnected, total clients: %d', client.request.connection.remoteAddress, connectedClients);
logger.log('info', '%s disconnected, total clients: %d', util.getRemoteAddr(client.request), connectedClients);
});
client.on('requestHistoryGraph', function() {

7
lib/server.js
View File

@ -27,12 +27,7 @@ function setupRoutes() {
function handleRequest(req, res) {
var requestUrl = url.parse(req.url).pathname;
let remoteAddress = req.connection.remoteAddress;
if (req.headers && (req.headers['cf-connecting-ip'] || req.headers['x-forwarded-for'])) {
remoteAddress = req.headers['cf-connecting-ip'] || req.headers['x-forwarded-for'];
}
logger.log('info', '%s requested: %s', remoteAddress, requestUrl);
logger.log('info', '%s requested: %s', util.getRemoteAddr(req), requestUrl);
if (requestUrl === '/publicConfig.json') {
res.setHeader('Content-Type', 'application/javascript');

5
lib/util.js
View File

@ -174,3 +174,8 @@ exports.unfurlSRV = function(hostname, port, callback) {
callback(records[0].name, records[0].port);
})
};
exports.getRemoteAddr = function(req) {
let remoteAddress = req.headers['cf-connecting-ip'] || req.headers['x-forwarded-for'] || req.connection.remoteAddress;
return remoteAddress;
};