Merge pull request #77 from nicolasmoreau/master

When a request is sent to the querystore, its ip address is found in …
VAMDC · Jan 12, 2018 · 76d8c8f · 76d8c8f
2 parents eeb5770 + c93356f
commit 76d8c8f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreRequestRegistry.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreRequestRegistry.java
@@ -49,13 +49,18 @@ public Map<String, QueryStoreProcessor> getQuerystoreProcessors() {
 	 * @return
 	 */
 	public String getIpAdress() {		
-		String ipAddress = ServletContexts.instance().getRequest()
+		// client and proxies IP are concatenated in this header field : client, proxy1, proxy2 ...
+		String ipAddresses = ServletContexts.instance().getRequest()
 				.getHeader("X-FORWARDED-FOR");
+		String clientAddress = "";
 
-		if (ipAddress == null) {
-			ipAddress = ServletContexts.instance().getRequest().getRemoteAddr();
+		if (ipAddresses == null) {
+			clientAddress = ServletContexts.instance().getRequest().getRemoteAddr();
+		}else{
+			// keep only original client ip
+			clientAddress = ipAddresses.split(",")[0];			
 		}
-		return ipAddress;
+		return clientAddress;
 	}
 
 }