summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/HttpRequestService.ts
diff options
context:
space:
mode:
authorJulia <julia@insertdomain.name>2024-11-21 01:44:15 +0000
committerJulia <julia@insertdomain.name>2024-11-21 01:44:15 +0000
commit757d9aa5ee16aefd20c99e4d29f91148f012c17b (patch)
tree488cbe6d4883f03ffcca75aeb9c9a75717b8ab0f /packages/backend/src/core/HttpRequestService.ts
parentmerge: (re-merge) Prevent DoS from spammed media proxy requests (!763) (diff)
parentFix another style error (diff)
downloadsharkey-757d9aa5ee16aefd20c99e4d29f91148f012c17b.tar.gz
sharkey-757d9aa5ee16aefd20c99e4d29f91148f012c17b.tar.bz2
sharkey-757d9aa5ee16aefd20c99e4d29f91148f012c17b.zip
merge: Fix type error(s) in security fixes (!764)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/764 Approved-by: Hazelnoot <acomputerdog@gmail.com>
Diffstat (limited to 'packages/backend/src/core/HttpRequestService.ts')
-rw-r--r--packages/backend/src/core/HttpRequestService.ts12
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 0ad5667049..083153940a 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -54,19 +54,19 @@ class HttpRequestServiceAgent extends http.Agent {
}
});
return socket;
- };
+ }
@bindThis
private isPrivateIp(ip: string): boolean {
const parsedIp = ipaddr.parse(ip);
-
+
for (const net of this.config.allowedPrivateNetworks ?? []) {
const cidr = ipaddr.parseCIDR(net);
if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
return false;
}
}
-
+
return parsedIp.range() !== 'unicast';
}
}
@@ -93,19 +93,19 @@ class HttpsRequestServiceAgent extends https.Agent {
}
});
return socket;
- };
+ }
@bindThis
private isPrivateIp(ip: string): boolean {
const parsedIp = ipaddr.parse(ip);
-
+
for (const net of this.config.allowedPrivateNetworks ?? []) {
const cidr = ipaddr.parseCIDR(net);
if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
return false;
}
}
-
+
return parsedIp.range() !== 'unicast';
}
}