summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/HttpRequestService.ts
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-11-21 12:10:02 +0900
committerGitHub <noreply@github.com>2024-11-21 12:10:02 +0900
commit3a6c2aa83563515b2ce02cda289b0271d992e84e (patch)
tree5edb2e58a26b560fc398507ec879a1fcc68c5511 /packages/backend/src/core/HttpRequestService.ts
parentfix(backend): fix security patches (#15008) (diff)
downloadsharkey-3a6c2aa83563515b2ce02cda289b0271d992e84e.tar.gz
sharkey-3a6c2aa83563515b2ce02cda289b0271d992e84e.tar.bz2
sharkey-3a6c2aa83563515b2ce02cda289b0271d992e84e.zip
fix(backend): fix type error(s) in security fixes (#15009)
* Fix type error in security fixes (cherry picked from commit fa3cf6c2996741e642955c5e2fca8ad785e83205) * Fix error in test function calls (cherry picked from commit 1758f29364eca3cbd13dbb5c84909c93712b3b3b) * Fix style error (cherry picked from commit 23c4aa25714af145098baa7edd74c1d217e51c1a) * Fix another style error (cherry picked from commit 36af07abe28bec670aaebf9f5af5694bb582c29a) * Fix `.punyHost` misuse (cherry picked from commit 6027b516e1c82324d55d6e54d0e17cbd816feb42) * attempt to fix test: make yaml valid --------- Co-authored-by: Julia Johannesen <julia@insertdomain.name>
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';
}
}