kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-07-30 16:59:15 +02:00
Code Issues Activity

now?

Browse Source
This commit is contained in:
kuba
2026-03-23 13:53:05 +01:00
parent 8762d4042c
commit fcc95414e6
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/helpers.js
+10 -11
View File
@@ -143,20 +143,20 @@ function handleConnect(clientIp, currentUsers, ws, callback) {
consoleCmd.logWarn('geoip-lite is not installed; location will be Unknown.'); consoleCmd.logWarn('geoip-lite is not installed; location will be Unknown.');
} }
const inFlightPromise = fetchIpWhoisInfo(normalizedClientIp) const inFlightPromise = fetchIpWhoisInfo(clientIp)
.then((whoisInfo) => { .then((whoisInfo) => {
const merged = { ...locationInfo, ...whoisInfo }; const merged = { ...locationInfo, ...whoisInfo };
ipCache.set(normalizedClientIp, merged); ipCache.set(clientIp, merged);
ipInfoInFlight.delete(normalizedClientIp); ipInfoInFlight.delete(clientIp);
return merged; return merged;
}) })
.catch(() => { .catch(() => {
ipCache.set(normalizedClientIp, locationInfo); ipCache.set(clientIp, locationInfo);
ipInfoInFlight.delete(normalizedClientIp); ipInfoInFlight.delete(clientIp);
return locationInfo; return locationInfo;
}); });
ipInfoInFlight.set(normalizedClientIp, inFlightPromise); ipInfoInFlight.set(clientIp, inFlightPromise);
inFlightPromise.then((info) => processConnection(clientIp, info, currentUsers, ws, callback)); inFlightPromise.then((info) => processConnection(clientIp, info, currentUsers, ws, callback));
} }
@@ -332,11 +332,10 @@ function antispamProtection(message, clientIp, ws, userCommands, lastWarn, userC
const rawCommand = message.toString(); const rawCommand = message.toString();
const command = rawCommand.replace(/[\r\n]+/g, ''); const command = rawCommand.replace(/[\r\n]+/g, '');
const now = Date.now(); const now = Date.now();
const normalizedClientIp = clientIp?.replace(/^::ffff:/, '');
if (endpointName === 'text') consoleCmd.logDebug(`Command received from \x1b[90m${clientIp}\x1b[0m: ${command}`); if (endpointName === 'text') consoleCmd.logDebug(`Command received from \x1b[90m${clientIp}\x1b[0m: ${command}`);
if (command.length > maxPayloadSize) { if (command.length > maxPayloadSize) {
consoleCmd.logWarn(`Command from \x1b[90m${normalizedClientIp}\x1b[0m on \x1b[90m/${endpointName}\x1b[0m exceeded maximum payload size (${parseInt(command.length / 1024)} KB / ${parseInt(maxPayloadSize / 1024)} KB).`); consoleCmd.logWarn(`Command from \x1b[90m${clientIp}\x1b[0m on \x1b[90m/${endpointName}\x1b[0m exceeded maximum payload size (${parseInt(command.length / 1024)} KB / ${parseInt(maxPayloadSize / 1024)} KB).`);
return ""; return "";
} }
@@ -354,12 +353,12 @@ function antispamProtection(message, clientIp, ws, userCommands, lastWarn, userC
consoleCmd.logWarn(`User \x1b[90m${clientIp}\x1b[0m is spamming with rapid commands. Connection will be terminated and user will be banned.`); consoleCmd.logWarn(`User \x1b[90m${clientIp}\x1b[0m is spamming with rapid commands. Connection will be terminated and user will be banned.`);
// Check if the normalized IP is already in the banlist // Check if the normalized IP is already in the banlist
const isAlreadyBanned = serverConfig.webserver.banlist.some(banEntry => banEntry[0] === normalizedClientIp); const isAlreadyBanned = serverConfig.webserver.banlist.some(banEntry => banEntry[0] === clientIp);
if (!isAlreadyBanned) { if (!isAlreadyBanned) {
// Add the normalized IP to the banlist // Add the normalized IP to the banlist
serverConfig.webserver.banlist.push([normalizedClientIp, 'Unknown', Date.now(), '[Auto ban] Spam']); serverConfig.webserver.banlist.push([clientIp, 'Unknown', Date.now(), '[Auto ban] Spam']);
consoleCmd.logInfo(`User \x1b[90m${normalizedClientIp}\x1b[0m has been added to the banlist due to extreme spam.`); consoleCmd.logInfo(`User \x1b[90m${clientIp}\x1b[0m has been added to the banlist due to extreme spam.`);
configSave(); configSave();
} }
server/index.js
+2 -3
View File
@@ -306,7 +306,6 @@ wss.on('connection', (ws, request) => {
const output = serverConfig.xdrd.wirelessConnection ? client : serialport; const output = serverConfig.xdrd.wirelessConnection ? client : serialport;
let clientIp = helpers.getIpAddress(request); let clientIp = helpers.getIpAddress(request);
const userCommandHistory = {}; const userCommandHistory = {};
const normalizedClientIp = clientIp?.replace(/^::ffff:/, '');
if (clientIp && serverConfig.webserver.banlist?.includes(clientIp)) { if (clientIp && serverConfig.webserver.banlist?.includes(clientIp)) {
ws.close(1008, 'Banned IP'); ws.close(1008, 'Banned IP');
@@ -328,7 +327,7 @@ wss.on('connection', (ws, request) => {
const lastLogTime = ipLogTimestamps.get(clientIp) || 0; const lastLogTime = ipLogTimestamps.get(clientIp) || 0;
const now = Date.now(); const now = Date.now();
if (now - lastLogTime > IP_LOG_INTERVAL_MS) { if (now - lastLogTime > IP_LOG_INTERVAL_MS) {
logWarn(`Web client \x1b[31mclosed: limit exceeded\x1b[0m (${normalizedClientIp}) \x1b[90m[${currentUsers}]`); logWarn(`Web client \x1b[31mclosed: limit exceeded\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
ipLogTimestamps.set(clientIp, now); ipLogTimestamps.set(clientIp, now);
} }
return; return;
@@ -481,7 +480,7 @@ wss.on('connection', (ws, request) => {
if (currentUsers === 0 && serverConfig.autoShutdown === true && serverConfig.xdrd.wirelessConnection === true) client.write('X\n'); if (currentUsers === 0 && serverConfig.autoShutdown === true && serverConfig.xdrd.wirelessConnection === true) client.write('X\n');
if (code !== 1008) logInfo(`Web client \x1b[31mdisconnected\x1b[0m (${normalizedClientIp}) \x1b[90m[${currentUsers}]`); if (code !== 1008) logInfo(`Web client \x1b[31mdisconnected\x1b[0m (${clientIp}) \x1b[90m[${currentUsers}]`);
}); });
ws.on('error', console.error); ws.on('error', console.error);