fix: Optimize IP detection logic and add error handling

- #4038
- Check existence of clientIp and ignoreIps in advance
- Add error handling for CIDR parsing
This commit is contained in:
Kissablecho 2026-02-17 21:46:30 +08:00
parent 09bc2ee5c8
commit 9a66a2a461

View file

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