1 files changed, 27 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/helper/ServletHelper.java b/src/main/java/org/traccar/helper/ServletHelper.java
new file mode 100644
index 000000000..e3481e249
--- /dev/null
+++ b/src/main/java/org/traccar/helper/ServletHelper.java
@@ -0,0 +1,27 @@
+package org.traccar.helper;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+public final class ServletHelper {
+
+    private ServletHelper() {
+    }
+
+    public static String retrieveRemoteAddress(HttpServletRequest request) {
+
+        if (request != null) {
+            String remoteAddress = request.getHeader("X-FORWARDED-FOR");
+
+            if (remoteAddress != null && !remoteAddress.isEmpty()) {
+                return remoteAddress.substring(0, remoteAddress.indexOf(",")); // removes the additional data
+            } else {
+                remoteAddress = request.getRemoteAddr();
+                return remoteAddress;
+            }
+        } else {
+            return null;
+        }
+    }
+
+}