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

Update

Browse source
This commit is contained in:
Sefinek 2024-08-29 13:50:15 +02:00
parent 20c1719cda
commit 22ef400b54
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
index.js
View file

@ -35,7 +35,14 @@ const fetchBlockedIPs = async () => {
const isIPReportedRecently = (ip, reportedIPs) => { const isIPReportedRecently = (ip, reportedIPs) => {
const lastReport = reportedIPs.find(entry => entry.ip === ip && (entry.action === 'Reported' || entry.action.startsWith('Failed'))); const lastReport = reportedIPs.find(entry => entry.ip === ip && (entry.action === 'Reported' || entry.action.startsWith('Failed')));
return lastReport ? (Date.now() - new Date(lastReport.timestamp).getTime()) < REPORTED_IP_COOLDOWN_MS : false; if (lastReport) {
const lastTimestamp = new Date(lastReport.timestamp).getTime();
const currentTime = Date.now();
const timeDifference = currentTime - lastTimestamp;
if (timeDifference < REPORTED_IP_COOLDOWN_MS) return { recentlyReported: true, timeDifference };
}
return { recentlyReported: false };
}; };
const reportIP = async (event, url, country, cycleErrorCounts) => { const reportIP = async (event, url, country, cycleErrorCounts) => {
@ -108,8 +115,12 @@ 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 (isIPReportedRecently(ip, reportedIPs)) { const { recentlyReported, timeDifference } = isIPReportedRecently(ip, reportedIPs);
log('info', `IP ${ip} was reported or rate-limited recently. Skipping...`); if (recentlyReported) {
const hoursAgo = Math.floor(timeDifference / (1000 * 60 * 60));
const minutesAgo = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
const secondsAgo = Math.floor((timeDifference % (1000 * 60)) / 1000);
log('info', `${ip} was reported or rate-limited ${hoursAgo}h ${minutesAgo}m ${secondsAgo}s ago. Skipping...`);
cycleSkippedCount++; cycleSkippedCount++;
continue; continue;
} }
@ -135,8 +146,8 @@ const reportIP = async (event, url, country, cycleErrorCounts) => {
} }
log('info', `Cycle Summary [${cycleId}]:`); log('info', `Cycle Summary [${cycleId}]:`);
log('info', `- Total IPs processed: ${cycleProcessedCount}`);
log('info', `- Reported IPs: ${cycleReportedCount}`); log('info', `- Reported IPs: ${cycleReportedCount}`);
log('info', `- Total IPs processed: ${cycleProcessedCount}`);
log('info', `- Skipped IPs: ${cycleSkippedCount}`); log('info', `- Skipped IPs: ${cycleSkippedCount}`);
log('info', `- Skipped due to Image Requests: ${cycleImageSkippedCount}`); log('info', `- Skipped due to Image Requests: ${cycleImageSkippedCount}`);
log('info', `- 429 Too Many Requests: ${cycleErrorCounts.blocked}`); log('info', `- 429 Too Many Requests: ${cycleErrorCounts.blocked}`);

2
scripts/payload.js
View file

@ -3,7 +3,7 @@ const query = `query ListFirewallEvents($zoneTag: string, $filter: FirewallEvent
zones(filter: { zoneTag: $zoneTag }) { zones(filter: { zoneTag: $zoneTag }) {
firewallEventsAdaptive( firewallEventsAdaptive(
filter: $filter, filter: $filter,
limit: 500, limit: 700,
orderBy: [datetime_DESC] orderBy: [datetime_DESC]
) { ) {
action action