Rename ServletHelper to WebHelper

1 files changed, 51 insertions, 0 deletions

diff --git a/src/main/java/org/traccar/helper/WebHelper.java b/src/main/java/org/traccar/helper/WebHelper.java
new file mode 100644
index 000000000..9c6547d8d
--- /dev/null
+++ b/src/main/java/org/traccar/helper/WebHelper.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.helper;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.eclipse.jetty.util.URIUtil;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
+
+public final class WebHelper {
+
+    private WebHelper() {
+    }
+
+    public static String retrieveRemoteAddress(HttpServletRequest request) {
+
+        if (request != null) {
+            String remoteAddress = request.getHeader("X-FORWARDED-FOR");
+
+            if (remoteAddress != null && !remoteAddress.isEmpty()) {
+                int separatorIndex = remoteAddress.indexOf(",");
+                if (separatorIndex > 0) {
+                    return remoteAddress.substring(0, separatorIndex); // remove the additional data
+                } else {
+                    return remoteAddress;
+                }
+            } else {
+                return request.getRemoteAddr();
+            }
+        } else {
+            return null;
+        }
+    }
+}