ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove is ignoreIps

pull/1645/head
Fernando Gabriel Sarmiento Diaz 2022-11-09 15:34:28 +09:00
parent a9c32ecca9
commit 85be465d67
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
pages/api/collect.js
View File

@ -1,12 +1,11 @@
/* eslint-disable no-console */ /* eslint-disable no-console */
const { Resolver } = require('dns').promises; // const { Resolver } = require('dns').promises;
// import isbot from 'isbot'; // import isbot from 'isbot';
import ipaddr from 'ipaddr.js';
import { createToken, send, badRequest, forbidden } from 'next-basics';
import { savePageView, saveEvent } from 'queries';
import { useCors, useSession } from 'lib/middleware';
import { getJsonBody, getIpAddress } from 'lib/request';
import { secret, uuid } from 'lib/crypto'; import { secret, uuid } from 'lib/crypto';
import { useCors, useSession } from 'lib/middleware';
import { getJsonBody } from 'lib/request';
import { badRequest, createToken, send } from 'next-basics';
import { saveEvent, savePageView } from 'queries';
export default async (req, res) => { export default async (req, res) => {
await useCors(req, res); await useCors(req, res);
@ -15,48 +14,48 @@ export default async (req, res) => {
// return unauthorized(res); // return unauthorized(res);
// } // }
const ignoreIps = process.env.IGNORE_IP; // const ignoreIps = process.env.IGNORE_IP;
const ignoreHostnames = process.env.IGNORE_HOSTNAME; // const ignoreHostnames = process.env.IGNORE_HOSTNAME;
if (ignoreIps || ignoreHostnames) { // if (ignoreIps || ignoreHostnames) {
const ips = []; // const ips = [];
if (ignoreIps) { // if (ignoreIps) {
ips.push(...ignoreIps.split(',').map(n => n.trim())); // ips.push(...ignoreIps.split(',').map(n => n.trim()));
} // }
if (ignoreHostnames) { // if (ignoreHostnames) {
const resolver = new Resolver(); // const resolver = new Resolver();
const promises = ignoreHostnames // const promises = ignoreHostnames
.split(',') // .split(',')
.map(n => resolver.resolve4(n.trim()).catch(() => {})); // .map(n => resolver.resolve4(n.trim()).catch(() => {}));
await Promise.all(promises).then(resolvedIps => { // await Promise.all(promises).then(resolvedIps => {
ips.push(...resolvedIps.filter(n => n).flatMap(n => n)); // ips.push(...resolvedIps.filter(n => n).flatMap(n => n));
}); // });
} // }
const clientIp = getIpAddress(req); // const clientIp = getIpAddress(req);
const blocked = ips.find(ip => { // const blocked = ips.find(ip => {
console.log('collect.js', ip, clientIp); // console.log('collect.js', ip, clientIp);
if (ip === clientIp) return true; // if (ip === clientIp) return true;
// CIDR notation // // CIDR notation
if (ip.indexOf('/') > 0) { // if (ip.indexOf('/') > 0) {
const addr = ipaddr.parse(clientIp); // const addr = ipaddr.parse(clientIp);
const range = ipaddr.parseCIDR(ip); // const range = ipaddr.parseCIDR(ip);
if (addr.kind() === range[0].kind() && addr.match(range)) return true; // if (addr.kind() === range[0].kind() && addr.match(range)) return true;
} // }
return false; // return false;
}); // });
if (blocked) { // if (blocked) {
return forbidden(res); // return forbidden(res);
} // }
} // }
await useSession(req, res); await useSession(req, res);