From 1096ed1e09d33f4ad22847e096b7476dfe7374bf Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sat, 2 Apr 2022 16:50:15 -0500 Subject: [PATCH] Just say fuck you if an IP wasn't detected --- src/main/java/dev/plex/request/impl/AdminsEndpoint.java | 4 ++-- src/main/java/dev/plex/request/impl/IndefBansEndpoint.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/plex/request/impl/AdminsEndpoint.java b/src/main/java/dev/plex/request/impl/AdminsEndpoint.java index d2cd14b..ad732d9 100644 --- a/src/main/java/dev/plex/request/impl/AdminsEndpoint.java +++ b/src/main/java/dev/plex/request/impl/AdminsEndpoint.java @@ -21,10 +21,10 @@ public class AdminsEndpoint extends AbstractServlet @GetMapping(endpoint = "/api/admins/") public String getAdmins(HttpServletRequest request) { - String ipAddress = request.getHeader("X-FORWARDED-FOR"); + String ipAddress = request.getRemoteAddr(); if (ipAddress == null) { - ipAddress = request.getRemoteAddr(); + return "An IP address could not be detected. Please ensure you are connecting using IPv4."; } final PlexPlayer player = DataUtils.getPlayerByIP(ipAddress); if (player == null) diff --git a/src/main/java/dev/plex/request/impl/IndefBansEndpoint.java b/src/main/java/dev/plex/request/impl/IndefBansEndpoint.java index 448e90d..20f5932 100644 --- a/src/main/java/dev/plex/request/impl/IndefBansEndpoint.java +++ b/src/main/java/dev/plex/request/impl/IndefBansEndpoint.java @@ -19,10 +19,10 @@ public class IndefBansEndpoint extends AbstractServlet @GetMapping(endpoint = "/api/indefbans/") public String getBans(HttpServletRequest request) { - String ipAddress = request.getHeader("X-FORWARDED-FOR"); + String ipAddress = request.getRemoteAddr(); if (ipAddress == null) { - ipAddress = request.getRemoteAddr(); + return "An IP address could not be detected. Please ensure you are connecting using IPv4."; } final PlexPlayer player = DataUtils.getPlayerByIP(ipAddress); if (player == null)