From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Oct 2017 12:12:08 +0000 (+0100)
Subject: web: Refactor current_address
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371a879e2a4009bc1d7281ada94a7691e658d17f;p=pbs.git

web: Refactor current_address

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index a65fa9f5..a4dbe7d1 100644
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -54,9 +54,7 @@ class BaseHandler(tornado.web.RequestHandler):
 		"""
 			Returns the IP address the request came from.
 		"""
-		remote_ips = self.request.remote_ip.split(", ")
-
-		return remote_ips[-1]
+		return self.request.headers.get("X-Real-IP") or self.request.remote_ip
 
 	@property
 	def timezone(self):