watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 03:55:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 350618471d into 09bc2ee5c8

Browse source
This commit is contained in:
Kissablecho 2026-02-17 14:02:04 +00:00 • committed by GitHub
commit da61f35a86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/lib/detect.ts
View file

@ -140,31 +140,31 @@ export async function getClientInfo(request: Request, payload: Record<string, an
export function hasBlockedIp(clientIp: string) {
const ignoreIps = process.env.IGNORE_IP;
if (ignoreIps) {
const ips = [];
if (!clientIp || !ignoreIps) {
return false;
}
if (ignoreIps) {
ips.push(...ignoreIps.split(',').map(n => n.trim()));
const ips = ignoreIps.split(',').map(n => n.trim());
return ips.some(ip => {
if (ip === clientIp) {
return true;
}
return ips.find(ip => {
if (ip === clientIp) {
return true;
}
// CIDR notation
if (ip.indexOf('/') > 0) {
// CIDR notation
if (ip.indexOf('/') > 0) {
try {
const addr = ipaddr.parse(clientIp);
const range = ipaddr.parseCIDR(ip);
if (addr.kind() === range[0].kind() && addr.match(range)) {
return true;
}
} catch {
// Ignore parsing errors
}
}
return false;
});
}
return false;
return false;
});
}