summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorHazel K <acomputerdog@gmail.com>2024-10-02 15:02:29 -0400
committerHazel K <acomputerdog@gmail.com>2024-10-02 15:02:29 -0400
commit484a39c65845eca8f2a54fb3e45c7d8f58e05152 (patch)
treee670be515a3f873fb898ec38ab26238bc8ceab31 /packages/backend/src/server/api
parentuse QueryService for blocks and mutes (diff)
parentmerge: fix exception when logging IP addresses (!644) (diff)
downloadsharkey-484a39c65845eca8f2a54fb3e45c7d8f58e05152.tar.gz
sharkey-484a39c65845eca8f2a54fb3e45c7d8f58e05152.tar.bz2
sharkey-484a39c65845eca8f2a54fb3e45c7d8f58e05152.zip
Merge branch 'develop' into hazelnoot/following-timeline
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/ApiCallService.ts5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts
index 808795fdac..2307e172d5 100644
--- a/packages/backend/src/server/api/ApiCallService.ts
+++ b/packages/backend/src/server/api/ApiCallService.ts
@@ -260,6 +260,11 @@ export class ApiCallService implements OnApplicationShutdown {
const meta = await this.metaService.fetch();
if (!meta.enableIpLogging) return;
const ip = request.ip;
+ if (!ip) {
+ this.logger.warn(`user ${user.id} has a null IP address; please check your network configuration.`);
+ return;
+ }
+
const ips = this.userIpHistories.get(user.id);
if (ips == null || !ips.has(ip)) {
if (ips == null) {