chillcog/UFW-AbuseIPDB-Reporter
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quality fixes v0.4.0

Browse Source
This commit is contained in:
Sefinek committed 2025-04-27 00:59:12 +02:00
1 parent 895653b012
commit a736e83e9a
4 files changed
+63 -93
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

index.js
+59 -89
View File
@@ -3,16 +3,16 @@
const fs = require('node:fs'); const fs = require('node:fs');
const chokidar = require('chokidar'); const chokidar = require('chokidar');
const isLocalIP = require('./scripts/utils/isLocalIP.js');
const parseTimestamp = require('./scripts/utils/parseTimestamp.js');
const log = require('./scripts/utils/log.js');
const axios = require('./scripts/services/axios.js'); const axios = require('./scripts/services/axios.js');
const { saveBufferToFile, loadBufferFromFile, sendBulkReport, BULK_REPORT_BUFFER } = require('./scripts/services/bulk.js'); const { saveBufferToFile, loadBufferFromFile, sendBulkReport, BULK_REPORT_BUFFER } = require('./scripts/services/bulk.js');
const { reportedIPs, loadReportedIPs, saveReportedIPs, isIPReportedRecently, markIPAsReported } = require('./scripts/services/cache.js'); const { reportedIPs, loadReportedIPs, saveReportedIPs, isIPReportedRecently, markIPAsReported } = require('./scripts/services/cache.js');
const { refreshServerIPs, getServerIPs } = require('./scripts/services/ipFetcher.js'); const { refreshServerIPs, getServerIPs } = require('./scripts/services/ipFetcher.js');
const { version, repoName, repoURL } = require('./scripts/utils/repo.js');
const sendWebhook = require('./scripts/services/discordWebhooks.js'); const sendWebhook = require('./scripts/services/discordWebhooks.js');
const isLocalIP = require('./scripts/utils/isLocalIP.js');
const { parseNumber, parseTimestamp } = require('./scripts/utils/parse.js');
const log = require('./scripts/utils/log.js');
const config = require('./config.js'); const config = require('./config.js');
const { version } = require('./package.json');
const { UFW_LOG_FILE, ABUSEIPDB_API_KEY, SERVER_ID, AUTO_UPDATE_ENABLED, AUTO_UPDATE_SCHEDULE, DISCORD_WEBHOOKS_ENABLED, DISCORD_WEBHOOKS_URL } = config.MAIN; const { UFW_LOG_FILE, ABUSEIPDB_API_KEY, SERVER_ID, AUTO_UPDATE_ENABLED, AUTO_UPDATE_SCHEDULE, DISCORD_WEBHOOKS_ENABLED, DISCORD_WEBHOOKS_URL } = config.MAIN;
const ABUSE_STATE = { isLimited: false, isBuffering: false, sentBulk: false }; const ABUSE_STATE = { isLimited: false, isBuffering: false, sentBulk: false };
@@ -26,7 +26,7 @@ const nextRateLimitReset = () => {
let LAST_RATELIMIT_LOG = 0, LAST_STATS_LOG = 0, RATELIMIT_RESET = nextRateLimitReset(), fileOffset = 0; let LAST_RATELIMIT_LOG = 0, LAST_STATS_LOG = 0, RATELIMIT_RESET = nextRateLimitReset(), fileOffset = 0;
const checkRateLimit = () => { const checkRateLimit = async () => {
const now = Date.now(); const now = Date.now();
if (now - LAST_STATS_LOG >= BUFFER_STATS_INTERVAL && BULK_REPORT_BUFFER.size > 0) LAST_STATS_LOG = now; if (now - LAST_STATS_LOG >= BUFFER_STATS_INTERVAL && BULK_REPORT_BUFFER.size > 0) LAST_STATS_LOG = now;
@@ -34,33 +34,31 @@ const checkRateLimit = () => {
if (now >= RATELIMIT_RESET.getTime()) { if (now >= RATELIMIT_RESET.getTime()) {
ABUSE_STATE.isLimited = false; ABUSE_STATE.isLimited = false;
ABUSE_STATE.isBuffering = false; ABUSE_STATE.isBuffering = false;
if (!ABUSE_STATE.sentBulk && BULK_REPORT_BUFFER.size > 0) sendBulkReport(); if (!ABUSE_STATE.sentBulk && BULK_REPORT_BUFFER.size > 0) await sendBulkReport();
RATELIMIT_RESET = nextRateLimitReset(); RATELIMIT_RESET = nextRateLimitReset();
ABUSE_STATE.sentBulk = false; ABUSE_STATE.sentBulk = false;
log(`Rate limit reset. Next reset scheduled at ${RATELIMIT_RESET.toISOString()}`, 1);
log(0, `Rate limit reset. Next reset scheduled at ${RATELIMIT_RESET.toISOString()}`, 1);
} else if (now - LAST_RATELIMIT_LOG >= RATE_LIMIT_LOG_INTERVAL) { } else if (now - LAST_RATELIMIT_LOG >= RATE_LIMIT_LOG_INTERVAL) {
const minutesLeft = Math.ceil((RATELIMIT_RESET.getTime() - now) / 60000); const minutesLeft = Math.ceil((RATELIMIT_RESET.getTime() - now) / 60000);
log(0, `Rate limit is still active. Collected ${BULK_REPORT_BUFFER.size} IPs. Waiting for reset in ${minutesLeft} minute(s) (${RATELIMIT_RESET.toISOString()})`, 1); log(`Rate limit is still active. Collected ${BULK_REPORT_BUFFER.size} IPs. Waiting for reset in ${minutesLeft} minute(s) (${RATELIMIT_RESET.toISOString()})`, 1);
LAST_RATELIMIT_LOG = now; LAST_RATELIMIT_LOG = now;
} }
} }
}; };
const reportIp = async ({ srcIp, dpt = 'N/A', proto = 'N/A', id, timestamp }, categories, comment) => { const reportIp = async ({ srcIp, dpt = 'N/A', proto = 'N/A', id, timestamp }, categories, comment) => {
if (!srcIp) return log(2, ' Missing source IP (srcIp)', 1); if (!srcIp) return log('Missing source IP (srcIp)', 3);
if (getServerIPs().includes(srcIp)) return; if (getServerIPs().includes(srcIp)) return;
if (isIPReportedRecently(srcIp)) return; if (isIPReportedRecently(srcIp)) return;
checkRateLimit(); await checkRateLimit();
if (ABUSE_STATE.isBuffering) { if (ABUSE_STATE.isBuffering) {
if (BULK_REPORT_BUFFER.has(srcIp)) return; if (BULK_REPORT_BUFFER.has(srcIp)) return;
BULK_REPORT_BUFFER.set(srcIp, { categories, timestamp, comment });
BULK_REPORT_BUFFER.set(srcIp, { timestamp, categories, comment });
saveBufferToFile(); saveBufferToFile();
log(0, `Queued ${srcIp} for bulk report (collected ${BULK_REPORT_BUFFER.size} IPs)`); log(`Queued ${srcIp} for bulk report (collected ${BULK_REPORT_BUFFER.size} IPs)`, 1);
return; return;
} }
@@ -71,110 +69,82 @@ const reportIp = async ({ srcIp, dpt = 'N/A', proto = 'N/A', id, timestamp }, ca
comment, comment,
}), { headers: { 'Key': ABUSEIPDB_API_KEY } }); }), { headers: { 'Key': ABUSEIPDB_API_KEY } });
log(0, `Reported ${srcIp} [${dpt}/${proto}]; ID: ${id}; Categories: ${categories}; Abuse: ${res.data.abuseConfidenceScore}%`); log(`Reported ${srcIp} [${dpt}/${proto}]; ID: ${id}; Categories: ${categories}; Abuse: ${res.data.abuseConfidenceScore}%`, 1);
return true; return true;
} catch (err) { } catch (err) {
if (err.response?.status === 429 && JSON.stringify(err.response?.data || {}).includes('Daily rate limit')) { const status = err.response?.status ?? 'unknown';
if (status === 429 && JSON.stringify(err.response?.data || {}).includes('Daily rate limit')) {
if (!ABUSE_STATE.isLimited) { if (!ABUSE_STATE.isLimited) {
ABUSE_STATE.isLimited = true; ABUSE_STATE.isLimited = true;
ABUSE_STATE.isBuffering = true; ABUSE_STATE.isBuffering = true;
ABUSE_STATE.sentBulk = false; ABUSE_STATE.sentBulk = false;
LAST_RATELIMIT_LOG = Date.now(); LAST_RATELIMIT_LOG = Date.now();
RATELIMIT_RESET = nextRateLimitReset(); RATELIMIT_RESET = nextRateLimitReset();
log(0, `Daily AbuseIPDB limit reached. Buffering reports until ${RATELIMIT_RESET.toISOString()}`, 1); log(`Daily AbuseIPDB limit reached. Buffering reports until ${RATELIMIT_RESET.toISOString()}`, 2);
}
if (BULK_REPORT_BUFFER.has(srcIp)) {
log(0, `${srcIp} is already in buffer, skipping`);
return;
} }
if (!BULK_REPORT_BUFFER.has(srcIp)) {
BULK_REPORT_BUFFER.set(srcIp, { timestamp, categories, comment }); BULK_REPORT_BUFFER.set(srcIp, { timestamp, categories, comment });
saveBufferToFile(); saveBufferToFile();
log(`Queued ${srcIp} for bulk report due to rate limit`, 2);
log(0, `Queued ${srcIp} for bulk report due to rate limit`); }
} else { } else {
const status = err.response?.status ?? 'unknown'; log(`Failed to report ${srcIp} [${dpt}/${proto}]; ${err.response?.data?.errors ? JSON.stringify(err.response.data.errors) : err.message}`, status === 429 ? 2 : 3);
log(
status === 429 ? 0 : 2,
`Failed to report ${srcIp} [${dpt}/${proto}];\n${err.response?.data?.errors ? JSON.stringify(err.response.data.errors) : err.message}`,
status === 429 ? 0 : 1
);
} }
} }
}; };
const toNumber = (str, regex) => {
const parsed = str.match(regex)?.[1];
return parsed ? Number(parsed) : parsed;
};
const processLogLine = async (line, test = false) => { const processLogLine = async (line, test = false) => {
if (!line.includes('[UFW BLOCK]')) return log(1, `Ignoring invalid line: ${line}`, 1); if (!line.includes('[UFW BLOCK]')) return log(`Ignoring invalid line: ${line}`, 2);
const data = { const data = {
timestamp: parseTimestamp(line), // Log timestamp timestamp: parseTimestamp(line),
srcIp: line.match(/SRC=([\d.]+)/)?.[1] || null, // Source IP address srcIp: line.match(/SRC=([\d.]+)/)?.[1] || null,
dstIp: line.match(/DST=([\d.]+)/)?.[1] || null, // Destination IP address dstIp: line.match(/DST=([\d.]+)/)?.[1] || null,
proto: line.match(/PROTO=(\S+)/)?.[1] || null, // Protocol (TCP, UDP, etc.) proto: line.match(/PROTO=(\S+)/)?.[1] || null,
spt: toNumber(line, /SPT=(\d+)/), // Source port spt: parseNumber(line, /SPT=(\d+)/),
dpt: toNumber(line, /DPT=(\d+)/), // Destination port dpt: parseNumber(line, /DPT=(\d+)/),
in: line.match(/IN=(\w+)/)?.[1] || null, // Input interface in: line.match(/IN=(\w+)/)?.[1] || null,
out: line.match(/OUT=(\w+)/)?.[1] || null, // Output interface out: line.match(/OUT=(\w+)/)?.[1] || null,
mac: line.match(/MAC=([\w:]+)/)?.[1] || null, // MAC address mac: line.match(/MAC=([\w:]+)/)?.[1] || null,
len: toNumber(line, /LEN=(\d+)/), // Packet length len: parseNumber(line, /LEN=(\d+)/),
ttl: toNumber(line, /TTL=(\d+)/), // Time to live ttl: parseNumber(line, /TTL=(\d+)/),
id: toNumber(line, /ID=(\d+)/), // Packet ID id: parseNumber(line, /ID=(\d+)/),
tos: line.match(/TOS=(\S+)/)?.[1] || null, // Type of service tos: line.match(/TOS=(\S+)/)?.[1] || null,
prec: line.match(/PREC=(\S+)/)?.[1] || null, // Precedence prec: line.match(/PREC=(\S+)/)?.[1] || null,
res: line.match(/RES=(\S+)/)?.[1] || null, // Reserved bits res: line.match(/RES=(\S+)/)?.[1] || null,
window: toNumber(line, /WINDOW=(\d+)/), // TCP Window size window: parseNumber(line, /WINDOW=(\d+)/),
urgp: toNumber(line, /URGP=(\d+)/), // Urgent pointer urgp: parseNumber(line, /URGP=(\d+)/),
ack: !!line.includes('ACK'), // ACK flag ack: !!line.includes('ACK'),
syn: !!line.includes('SYN'), // SYN flag syn: !!line.includes('SYN'),
}; };
const { srcIp, proto, dpt } = data; const { srcIp, proto, dpt } = data;
if (!srcIp) return log(2, `Missing SRC in the log line: ${line}`, 1); if (!srcIp) return log(`Missing SRC in the log line: ${line}`, 3);
const ips = getServerIPs(); const ips = getServerIPs();
if (!Array.isArray(ips)) return log(2, 'For some reason, \'ips\' is not an array', 1); if (!Array.isArray(ips)) return log('For some reason, `ips` from `getServerIPs()` is not an array', 3);
if (ips.includes(srcIp)) { if (ips.includes(srcIp)) return log(`Ignoring own IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
return log(0, `Ignoring own IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1); if (isLocalIP(srcIp)) return log(`Ignoring local IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
} if (proto === 'UDP') return log(`Skipping UDP traffic: SRC=${srcIp} DPT=${dpt}`, 1);
if (isLocalIP(srcIp)) {
return log(0, `Ignoring local IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
}
// Report MUST NOT be of an attack where the source address is likely spoofed i.e. SYN floods and UDP floods.
// TCP connections can only be reported if they complete the three-way handshake. UDP connections cannot be reported.
// Read more: https://www.abuseipdb.com/reporting-policy
if (proto === 'UDP') {
return log(0, `Skipping UDP traffic: SRC=${srcIp} DPT=${dpt}`);
}
// Tests
if (test) return data; if (test) return data;
if (isIPReportedRecently(srcIp)) { if (isIPReportedRecently(srcIp)) {
const lastReportedTime = reportedIPs.get(srcIp); const lastReportedTime = reportedIPs.get(srcIp);
const elapsedTime = Math.floor(Date.now() / 1000 - lastReportedTime); const elapsedTime = Math.floor(Date.now() / 1000 - lastReportedTime);
const days = Math.floor(elapsedTime / 86400); const days = Math.floor(elapsedTime / 86400);
const hours = Math.floor((elapsedTime % 86400) / 3600); const hours = Math.floor((elapsedTime % 86400) / 3600);
const minutes = Math.floor((elapsedTime % 3600) / 60); const minutes = Math.floor((elapsedTime % 3600) / 60);
const seconds = elapsedTime % 60; const seconds = elapsedTime % 60;
const timeAgo = [ const timeAgo = [
days && `${days}d`, days && `${days}d`,
hours && `${hours}h`, hours && `${hours}h`,
minutes && `${minutes}m`, minutes && `${minutes}m`,
(seconds || !days && !hours && !minutes) && `${seconds}s`, (seconds || (!days && !hours && !minutes)) && `${seconds}s`,
].filter(Boolean).join(' '); ].filter(Boolean).join(' ');
log(`${srcIp} was last reported on ${new Date(lastReportedTime * 1000).toLocaleString()} (${timeAgo} ago)`, 1);
log(0, `${srcIp} was last reported on ${new Date(lastReportedTime * 1000).toLocaleString()} (${timeAgo} ago)`);
return; return;
} }
@@ -188,22 +158,22 @@ const processLogLine = async (line, test = false) => {
}; };
(async () => { (async () => {
log(0, `Version ${version} - https://github.com/sefinek/UFW-AbuseIPDB-Reporter`); log(`Version ${version} - ${repoURL}`);
loadReportedIPs(); loadReportedIPs();
loadBufferFromFile(); loadBufferFromFile();
if (BULK_REPORT_BUFFER.size > 0 && !ABUSE_STATE.isLimited) { if (BULK_REPORT_BUFFER.size > 0 && !ABUSE_STATE.isLimited) {
log(0, `Found ${BULK_REPORT_BUFFER.size} IPs in buffer after restart. Sending bulk report...`); log(`Found ${BULK_REPORT_BUFFER.size} IPs in buffer after restart. Sending bulk report...`, 1);
await sendBulkReport(); await sendBulkReport();
} }
log(0, 'Trying to fetch your IPv4 and IPv6 address from api.sefinek.net...'); log('Trying to fetch your IPv4 and IPv6 address from api.sefinek.net...');
await refreshServerIPs(); await refreshServerIPs();
log(0, `Fetched ${getServerIPs()?.length} of your IP addresses. If any of them accidentally appear in the UFW logs, they will be ignored.`); log(`Fetched ${getServerIPs()?.length} of your IP addresses. If any of them accidentally appear in the UFW logs, they will be ignored.`, 1);
if (!fs.existsSync(UFW_LOG_FILE)) { if (!fs.existsSync(UFW_LOG_FILE)) {
log(2, `Log file ${UFW_LOG_FILE} does not exist`); log(`Log file ${UFW_LOG_FILE} does not exist`, 3);
return; return;
} }
@@ -214,26 +184,26 @@ const processLogLine = async (line, test = false) => {
const stats = fs.statSync(path); const stats = fs.statSync(path);
if (stats.size < fileOffset) { if (stats.size < fileOffset) {
fileOffset = 0; fileOffset = 0;
log(1, 'The file has been truncated, and the offset has been reset', 1); log('The file has been truncated, and the offset has been reset', 2);
} }
fs.createReadStream(path, { start: fileOffset, encoding: 'utf8' }).on('data', chunk => { fs.createReadStream(path, { start: fileOffset, encoding: 'utf8' })
.on('data', chunk => {
chunk.split('\n').filter(line => line.trim()).forEach(processLogLine); chunk.split('\n').filter(line => line.trim()).forEach(processLogLine);
}).on('end', () => { })
.on('end', () => {
fileOffset = stats.size; fileOffset = stats.size;
}); });
}); });
// Auto updates
if (AUTO_UPDATE_ENABLED && AUTO_UPDATE_SCHEDULE && SERVER_ID !== 'development') await require('./scripts/services/updates.js')(); if (AUTO_UPDATE_ENABLED && AUTO_UPDATE_SCHEDULE && SERVER_ID !== 'development') await require('./scripts/services/updates.js')();
if (DISCORD_WEBHOOKS_ENABLED && DISCORD_WEBHOOKS_URL) await require('./scripts/services/summaries.js')(); if (DISCORD_WEBHOOKS_ENABLED && DISCORD_WEBHOOKS_URL) await require('./scripts/services/summaries.js')();
// Final
if (SERVER_ID !== 'development') { if (SERVER_ID !== 'development') {
await sendWebhook(0, `[UFW-AbuseIPDB-Reporter](https://github.com/sefinek/UFW-AbuseIPDB-Reporter) has been successfully launched on the device \`${SERVER_ID}\`.`); await sendWebhook(0, `[${repoName}](${repoURL}) has been successfully launched on the device \`${SERVER_ID}\`.`);
} }
log(0, `Ready! Now monitoring: ${UFW_LOG_FILE}`); log(`Ready! Now monitoring: ${UFW_LOG_FILE}`, 1);
process.send && process.send('ready'); process.send && process.send('ready');
})(); })();
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "ufw-abuseipdb-reporter", "name": "ufw-abuseipdb-reporter",
"version": "0.3.2", "version": "0.4.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ufw-abuseipdb-reporter", "name": "ufw-abuseipdb-reporter",
"version": "0.3.2", "version": "0.4.0",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"axios": "^1.9.0", "axios": "^1.9.0",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ufw-abuseipdb-reporter", "name": "ufw-abuseipdb-reporter",
"version": "0.3.2", "version": "0.4.0",
"description": "A tool (with a simple installer) that monitors UFW firewall logs in real time and reports IP addresses to the AbuseIPDB database.", "description": "A tool (with a simple installer) that monitors UFW firewall logs in real time and reports IP addresses to the AbuseIPDB database.",
"homepage": "https://github.com/sefinek/UFW-AbuseIPDB-Reporter#readme", "homepage": "https://github.com/sefinek/UFW-AbuseIPDB-Reporter#readme",
"bugs": { "bugs": {
scripts
+1 -1
Submodule scripts updated: 8f80ed31f8...a9c5111d5a.