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

'log'

Browse source
This commit is contained in:
Sefinek 2024-09-06 00:23:07 +02:00
parent f1093fc562
commit d8765975f3
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
index.js
View file

@ -17,7 +17,7 @@ const fetchBlockedIPs = async () => {
const { data, status } = await axios.post('https://api.cloudflare.com/client/v4/graphql', PAYLOAD(), { headers: headers.CLOUDFLARE });
const events = data?.data?.viewer?.zones[0]?.firewallEventsAdaptive;
if (events) {
log('info', `Fetched ${events.length} events from Cloudflare`);
log('log', `Fetched ${events.length} events from Cloudflare`);
return events;
} else {
log('error', `Failed to retrieve data from Cloudflare. Status: ${status}`, data?.errors);
@ -70,13 +70,13 @@ const reportIP = async (event, hostname, endpoint, userAgent, country, cycleErro
}, { headers: headers.ABUSEIPDB });
logToCSV(event.rayName, event.clientIP, hostname, endpoint, event.userAgent, 'Reported', country);
log('info', `Reported ${event.clientIP}; URI: ${uri}`);
log('log', `Reported ${event.clientIP}; URI: ${uri}`);
return true;
} catch (err) {
if (err.response?.status === 429) {
logToCSV(event.rayName, event.clientIP, hostname, endpoint, event.userAgent, 'Failed - 429 Too Many Requests', country);
log('info', `Rate limited (429) while reporting ${event.clientIP}; URI: ${uri}`);
log('log', `Rate limited (429) while reporting ${event.clientIP}; URI: ${uri}`);
cycleErrorCounts.blocked++;
} else {
log('error', `Error ${err.response?.status} while reporting ${event.clientIP}; URI: ${uri}; (${err.response?.data})`);
@ -92,11 +92,11 @@ const reportIP = async (event, hostname, endpoint, userAgent, country, cycleErro
try {
process.send('ready');
} catch (err) {
log('info', `Failed to send ready signal to parent process. ${err.message}`);
log('log', `Failed to send ready signal to parent process. ${err.message}`);
}
}
log('info', 'Loading data, please wait...');
log('log', 'Loading data, please wait...');
await clientIp.fetchIPAddress();
// Sefinek API
@ -107,7 +107,7 @@ const reportIP = async (event, hostname, endpoint, userAgent, country, cycleErro
// AbuseIPDB
let cycleId = 1;
while (true) {
log('info', `===================== New Reporting Cycle (v${moduleVersion}) =====================`);
log('log', `===================== New Reporting Cycle (v${moduleVersion}) =====================`);
const blockedIPEvents = await fetchBlockedIPs();
if (!blockedIPEvents) {
@ -135,7 +135,7 @@ const reportIP = async (event, hostname, endpoint, userAgent, country, cycleErro
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...`);
log('log', `${ip} was reported or rate-limited ${hoursAgo}h ${minutesAgo}m ${secondsAgo}s ago. Skipping...`);
cycleSkippedCount++;
continue;
}
@ -146,7 +146,7 @@ const reportIP = async (event, hostname, endpoint, userAgent, country, cycleErro
logToCSV(event.rayName, ip, hostname, endpoint, null, 'Skipped - Image Request', country);
if (imageRequestLogged) continue;
log('info', 'Skipping image requests in this cycle...');
log('log', 'Skipping image requests in this cycle...');
imageRequestLogged = true;
}
@ -160,17 +160,17 @@ const reportIP = async (event, hostname, endpoint, userAgent, country, cycleErro
}
}
log('info', `Cycle Summary [${cycleId}]:`);
log('info', `- Reported IPs: ${cycleReportedCount}`);
log('info', `- Total IPs processed: ${cycleProcessedCount}`);
log('info', `- Skipped IPs: ${cycleSkippedCount}`);
log('info', `- Skipped due to Image Requests: ${cycleImageSkippedCount}`);
log('info', `- 429 Too Many Requests: ${cycleErrorCounts.blocked}`);
log('info', `- No response errors: ${cycleErrorCounts.noResponse}`);
log('info', `- Other errors: ${cycleErrorCounts.otherErrors}`);
log('info', '==================== End of Reporting Cycle ====================');
log('log', `Cycle Summary [${cycleId}]:`);
log('log', `- Reported IPs: ${cycleReportedCount}`);
log('log', `- Total IPs processed: ${cycleProcessedCount}`);
log('log', `- Skipped IPs: ${cycleSkippedCount}`);
log('log', `- Skipped due to Image Requests: ${cycleImageSkippedCount}`);
log('log', `- 429 Too Many Requests: ${cycleErrorCounts.blocked}`);
log('log', `- No response errors: ${cycleErrorCounts.noResponse}`);
log('log', `- Other errors: ${cycleErrorCounts.otherErrors}`);
log('log', '==================== End of Reporting Cycle ====================');
log('info', `Waiting ${formatDelay(CYCLE_INTERVAL)}...`);
log('log', `Waiting ${formatDelay(CYCLE_INTERVAL)}...`);
cycleId++;
await new Promise(resolve => setTimeout(resolve, CYCLE_INTERVAL));
}

2
scripts/csv.js
View file

@ -12,7 +12,7 @@ const checkCSVSize = () => {
const stats = fs.statSync(CSV_FILE_PATH);
if (stats.size > MAX_CSV_SIZE_BYTES) {
fs.writeFileSync(CSV_FILE_PATH, CSV_HEADER);
log('info', `CSV file size exceeded ${MAX_CSV_SIZE_BYTES / (1024 * 1024)} MB. File has been reset.`);
log('log', `CSV file size exceeded ${MAX_CSV_SIZE_BYTES / (1024 * 1024)} MB. File has been reset.`);
}
};

2
scripts/log.js
View file

@ -1,5 +1,5 @@
const levels = {
info: '[INFO]',
log: '[INFO]',
warn: '[WARN]',
error: '[FAIL]'
};

6
scripts/sefinekAPI.js
View file

@ -6,7 +6,7 @@ const SEFINEK_API_URL = process.env.SEFINEK_API_URL || `${process.env.NODE_ENV =
module.exports = async () => {
const reportedIPs = readReportedIPs().filter(ip => ip.action === 'Reported' && ip.sefinekAPI === 'false');
if (reportedIPs.length === 0) return log('info', 'No IPs with action "Reported" and SefinekAPI false to send to Sefinek API');
if (reportedIPs.length === 0) return log('log', 'No IPs with action "Reported" and SefinekAPI false to send to Sefinek API');
const uniqueLogs = reportedIPs.reduce((acc, ip) => {
if (acc.seen.has(ip.ip)) return acc;
@ -15,7 +15,7 @@ module.exports = async () => {
return acc;
}, { seen: new Set(), logs: [] }).logs;
if (!uniqueLogs?.length) return log('info', 'No unique IPs to send to Sefinek API');
if (!uniqueLogs?.length) return log('log', 'No unique IPs to send to Sefinek API');
try {
const res = await axios.post(SEFINEK_API_URL, {
@ -31,7 +31,7 @@ module.exports = async () => {
headers: { 'Authorization': process.env.SEFINEK_API_SECRET }
});
log('info', `Successfully sent ${res.data.count} logs to Sefinek API. Status: ${res.status}`);
log('log', `Successfully sent ${res.data.count} logs to Sefinek API. Status: ${res.status}`);
uniqueLogs.forEach(ip => updateSefinekAPIInCSV(ip.rayId, true));
} catch (err) {