Account for more than two IP addresses to be provided

igniterealtime · Sep 19, 2024 · 5899825 · 5899825
1 parent 5e86840
commit 5899825
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/jivesoftware/site/DownloadStats.java b/src/main/java/org/jivesoftware/site/DownloadStats.java
@@ -298,7 +298,7 @@ public static void addListingToDatabase( String ipAddress, String product, Strin
     {
         // Correct for X-Forwarded-For header value sometimes containing a list of IPs. Use the last one.
         if (ipAddress != null && ipAddress.contains(",")) {
-            ipAddress = ipAddress.substring(ipAddress.indexOf(",")+1).trim();
+            ipAddress = ipAddress.substring(ipAddress.lastIndexOf(",")+1).trim();
         }
 
         final DbConnectionManager connectionManager = DbConnectionManager.getInstance();
@@ -365,7 +365,7 @@ public static void addUpdateToDatabase( String ipAddress, String product, String
     {
         // Correct for X-Forwarded-For header value sometimes containing a list of IPs. Use the last one.
         if (ipAddress != null && ipAddress.contains(",")) {
-            ipAddress = ipAddress.substring(ipAddress.indexOf(",")+1).trim();
+            ipAddress = ipAddress.substring(ipAddress.lastIndexOf(",")+1).trim();
         }
 
         final DbConnectionManager connectionManager = DbConnectionManager.getInstance();
@@ -422,7 +422,7 @@ public static void addCheckUpdate( String ipAddress, String os, String currentVe
     {
         // Correct for X-Forwarded-For header value sometimes containing a list of IPs. Use the last one.
         if (ipAddress != null && ipAddress.contains(",")) {
-            ipAddress = ipAddress.substring(ipAddress.indexOf(",")+1).trim();
+            ipAddress = ipAddress.substring(ipAddress.lastIndexOf(",")+1).trim();
         }
 
         final DbConnectionManager connectionManager = DbConnectionManager.getInstance();