Merge remote-tracking branch 'upstream/develop' into art/bump-2023.12.2-develop

This commit is contained in:
ced 2024-01-14 09:59:32 +00:00
commit fbd599e274
9 changed files with 3893 additions and 9 deletions

View file

@ -145,7 +145,8 @@ export class DownloadService {
const parsedIp = ipaddr.parse(ip);
for (const net of this.config.allowedPrivateNetworks ?? []) {
if (parsedIp.match(ipaddr.parseCIDR(net))) {
const cidr = ipaddr.parseCIDR(net);
if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
return false;
}
}