From 280eea970a1d55637efddf5a32055762aa12d9b8 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <github@xpaw.me>
Date: Thu, 12 Oct 2017 10:57:25 +0300
Subject: [PATCH] Get client ip address correctly

---
 src/server.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server.js b/src/server.js
index 82982e66..2a0cab96 100644
--- a/src/server.js
+++ b/src/server.js
@@ -181,11 +181,11 @@ module.exports = function() {
 	return server;
 };
 
-function getClientIp(request) {
-	let ip = request.connection.remoteAddress;
+function getClientIp(socket) {
+	let ip = socket.handshake.address;
 
 	if (Helper.config.reverseProxy) {
-		const forwarded = (request.headers["x-forwarded-for"] || "").split(/\s*,\s*/).filter(Boolean);
+		const forwarded = (socket.request.headers["x-forwarded-for"] || "").split(/\s*,\s*/).filter(Boolean);
 
 		if (forwarded.length && net.isIP(forwarded[0])) {
 			ip = forwarded[0];
@@ -458,7 +458,7 @@ function initializeClient(socket, client, token, lastMessage) {
 		client.generateToken((newToken) => {
 			token = newToken;
 
-			client.updateSession(token, getClientIp(socket.request), socket.request);
+			client.updateSession(token, getClientIp(socket), socket.request);
 
 			sendInitEvent(token);
 		});
@@ -474,7 +474,7 @@ function performAuthentication(data) {
 	const finalInit = () => initializeClient(socket, client, data.token || null, data.lastMessage || -1);
 
 	const initClient = () => {
-		client.ip = getClientIp(socket.request);
+		client.ip = getClientIp(socket);
 
 		// If webirc is enabled perform reverse dns lookup
 		if (Helper.config.webirc === null) {
@@ -523,7 +523,7 @@ function performAuthentication(data) {
 
 	// We have found an existing user and client has provided a token
 	if (client && data.token && typeof client.config.sessions[data.token] !== "undefined") {
-		client.updateSession(data.token, getClientIp(socket.request), socket.request);
+		client.updateSession(data.token, getClientIp(socket), socket.request);
 
 		authCallback(true);
 		return;