watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-12 16:45:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed console command. Updated packages.

Browse source
This commit is contained in:
Mike Cao 2024-07-04 15:55:06 -07:00
parent 9118f24668
commit d501410a63
5 changed files with 371 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/detect.ts
View file

@ -2,9 +2,9 @@ import path from 'path';
import { getClientIp } from 'request-ip';
import { browserName, detectOS } from 'detect-browser';
import isLocalhost from 'is-localhost-ip';
import ipaddr from 'ipaddr.js';
import maxmind from 'maxmind';
import { safeDecodeURIComponent } from 'next-basics';
import {
DESKTOP_OS,
MOBILE_OS,
@ -137,3 +137,31 @@ export async function getClientInfo(req: NextApiRequestCollect) {
return { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device };
}
export function hasBlockedIp(req: NextApiRequestCollect) {
const ignoreIps = process.env.IGNORE_IP;
if (ignoreIps) {
const ips = [];
if (ignoreIps) {
ips.push(...ignoreIps.split(',').map(n => n.trim()));
}
const clientIp = getIpAddress(req);
return ips.find(ip => {
if (ip === clientIp) return true;
// CIDR notation
if (ip.indexOf('/') > 0) {
const addr = ipaddr.parse(clientIp);
const range = ipaddr.parseCIDR(ip);
if (addr.kind() === range[0].kind() && addr.match(range)) return true;
}
});
}
return false;
}