From 2b61effb1f843a6dbea4fd14aa2abfb1f1bb1d70 Mon Sep 17 00:00:00 2001
From: Irfan Ariq <irfanariq@home.com>
Date: Mon, 27 Nov 2017 09:28:44 +0000
Subject: [PATCH] fix token in webapp
---
.../java/com/jauharteam/ojek/webapp/LoginServlet.java | 10 +++++++++-
.../com/jauharteam/ojek/webapp/RegisterServlet.java | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java
index 4c8e2bd09..85589a985 100644
--- a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java
+++ b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/LoginServlet.java
@@ -35,8 +35,16 @@ public class LoginServlet extends WebappServlet {
String password = req.getParameter("password");
//===================================================//
+ String remoteAddr = "";
+ if (req!= null) {
+ remoteAddr = req.getHeader("X-FORWARDED-FOR");
+ if (remoteAddr == null || "".equals(remoteAddr)) {
+ remoteAddr = req.getRemoteAddr();
+ }
+ }
+
String userAgent = req.getHeader("User-Agent");
- String ipAddress = req.getRemoteAddr();
+ String ipAddress = remoteAddr;
System.out.println("webapp-user " + userAgent);
System.out.println("webapp-ip " + ipAddress);
diff --git a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java
index c83226d37..dc7474669 100644
--- a/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java
+++ b/PrOjek/webapp/src/main/java/com/jauharteam/ojek/webapp/RegisterServlet.java
@@ -34,8 +34,16 @@ public class RegisterServlet extends WebappServlet {
String driverStr = req.getParameter("driver");
//===================================================//
+ String remoteAddr = "";
+ if (req!= null) {
+ remoteAddr = req.getHeader("X-FORWARDED-FOR");
+ if (remoteAddr == null || "".equals(remoteAddr)) {
+ remoteAddr = req.getRemoteAddr();
+ }
+ }
+
String userAgent = req.getHeader("User-Agent");
- String ipAddress = req.getRemoteAddr();
+ String ipAddress = remoteAddr;
System.out.println("webapp-user " + userAgent);
System.out.println("webapp-ip " + ipAddress);
--
GitLab