JoshS/Cloudflare-WAF-To-AbuseIPDB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

isIPReportedRecently

Browse source
This commit is contained in:
Sefinek 2024-08-17 22:59:35 +02:00
parent f8623056e9
commit 98acd8c8e4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
index.js
View file

@ -10,7 +10,6 @@ const formatDelay = require('./scripts/formatDelay.js');
const log = require('./scripts/log.js'); const log = require('./scripts/log.js');
const COOLDOWN_MS = 2000; const COOLDOWN_MS = 2000;
const BLOCK_TIME_MS = 5 * 60 * 60 * 1000;
const REPORTED_IP_COOLDOWN_MS = 7 * 60 * 60 * 1000; const REPORTED_IP_COOLDOWN_MS = 7 * 60 * 60 * 1000;
const fetchBlockedIPs = async () => { const fetchBlockedIPs = async () => {
@ -29,11 +28,11 @@ const fetchBlockedIPs = async () => {
} }
}; };
const isIPBlockedOrReportedRecently = (ip, reportedIPs) => { const isIPReportedRecently = (ip, reportedIPs) => {
const lastReportOrBlock = reportedIPs.find(entry => entry.ip === ip); const lastReport = reportedIPs.find(entry => entry.ip === ip && entry.action === 'Reported');
if (!lastReportOrBlock) return false; if (!lastReport) return false;
const lastTimestamp = new Date(lastReportOrBlock.timestamp).getTime(); const lastTimestamp = new Date(lastReport.timestamp).getTime();
const currentTime = Date.now(); const currentTime = Date.now();
return (currentTime - lastTimestamp) < REPORTED_IP_COOLDOWN_MS; return (currentTime - lastTimestamp) < REPORTED_IP_COOLDOWN_MS;
@ -55,7 +54,7 @@ const reportIP = async (event, url, country, cycleErrorCounts) => {
if (err.response) { if (err.response) {
if (err.response.status === 429) { if (err.response.status === 429) {
logToCSV(new Date(), event.rayName, event.clientIP, url, 'Blocked - 429 Too Many Requests', country); logToCSV(new Date(), event.rayName, event.clientIP, url, 'Blocked - 429 Too Many Requests', country);
log('warn', `Rate limited (429) while reporting: ${event.clientIP}; URL: ${url}; (Will retry after 5 hours)`); log('warn', `Rate limited (429) while reporting: ${event.clientIP}; URL: ${url};`);
cycleErrorCounts.blocked++; cycleErrorCounts.blocked++;
} else { } else {
log('error', `Error ${err.response.status} while reporting: ${event.clientIP}; URL: ${url}; Message: ${err.response.data.message}`); log('error', `Error ${err.response.status} while reporting: ${event.clientIP}; URL: ${url}; Message: ${err.response.data.message}`);
@ -92,7 +91,8 @@ const reportIP = async (event, url, country, cycleErrorCounts) => {
const url = `${event.clientRequestHTTPHost}${event.clientRequestPath}`; const url = `${event.clientRequestHTTPHost}${event.clientRequestPath}`;
const country = event.clientCountryName; const country = event.clientCountryName;
if (isIPBlockedOrReportedRecently(ip, reportedIPs)) { if (isIPReportedRecently(ip, reportedIPs)) {
log('info', `IP ${ip} was reported recently. Skipping...`);
cycleSkippedCount++; cycleSkippedCount++;
continue; continue;
} }