From 9fa77cdea251b5e32a351298bbe97a88abec3e56 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 4 Nov 2014 23:25:18 +0000
Subject: [PATCH] working handling of setting client ip and anonymizing etc

---
 src/node/handler/PadMessageHandler.js | 21 ++++++++++++---------
 src/node/handler/SocketIORouter.js    |  9 ++++++---
 src/node/hooks/express/socketio.js    |  8 +++++---
 src/node/utils/RemoteAddress.js       |  1 +
 4 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 src/node/utils/RemoteAddress.js

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 3c39c4d86..b4e6243f0 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -37,6 +37,7 @@ var _ = require('underscore');
 var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
 var channels = require("channels");
 var stats = require('../stats');
+var remoteAddress = require("../utils/RemoteAddress").remoteAddress;
 
 /**
  * A associative array that saves informations about a session
@@ -115,16 +116,18 @@ exports.handleDisconnect = function(client)
   //if this connection was already etablished with a handshake, send a disconnect message to the others
   if(session && session.author)
   {
-    /*
-    client.get('remoteAddress', function(er, ip) {
-      //Anonymize the IP address if IP logging is disabled
-      if(settings.disableIPlogging) {
-        ip = 'ANONYMOUS';
-      }
 
-      accessLogger.info('[LEAVE] Pad "'+session.padId+'": Author "'+session.author+'" on client '+client.id+' with IP "'+ip+'" left the pad')
-    })
-    */
+console.log(remoteAddress);
+
+    // Get the IP address from our persistant object
+    var ip = remoteAddress[client.id];
+
+    // Anonymize the IP address if IP logging is disabled
+    if(settings.disableIPlogging) {
+      ip = 'ANONYMOUS';
+    }
+
+    accessLogger.info('[LEAVE] Pad "'+session.padId+'": Author "'+session.author+'" on client '+client.id+' with IP "'+ip+'" left the pad')
 
     //get the author color out of the db
     authorManager.getAuthorColorId(session.author, function(err, color)
diff --git a/src/node/handler/SocketIORouter.js b/src/node/handler/SocketIORouter.js
index 96260254d..0a7361f42 100644
--- a/src/node/handler/SocketIORouter.js
+++ b/src/node/handler/SocketIORouter.js
@@ -24,6 +24,7 @@ var log4js = require('log4js');
 var messageLogger = log4js.getLogger("message");
 var securityManager = require("../db/SecurityManager");
 var readOnlyManager = require("../db/ReadOnlyManager");
+var remoteAddress = require("../utils/RemoteAddress").remoteAddress;
 var settings = require('../utils/Settings');
 
 /**
@@ -57,12 +58,14 @@ exports.setSocketIO = function(_socket) {
   socket.sockets.on('connection', function(client)
   {
 
-// Broken: See http://stackoverflow.com/questions/4647348/send-message-to-specific-client-with-socket-io-and-node-js
+    // Broken: See http://stackoverflow.com/questions/4647348/send-message-to-specific-client-with-socket-io-and-node-js
+    // Fixed by having a persistant object, ideally this would actually be in the database layer
+    // TODO move to database layer
     if(settings.trustProxy && client.handshake.headers['x-forwarded-for'] !== undefined){
-//      client.set('remoteAddress', client.handshake.headers['x-forwarded-for']);
+      remoteAddress[client.id] = client.handshake.headers['x-forwarded-for'];
     }
     else{
-//      client.set('remoteAddress', client.handshake.address);
+      remoteAddress[client.id] = client.handshake.address;
     }
     var clientAuthorized = false;
     
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index 98146bbbb..e88a3f4c0 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -51,9 +51,11 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   // This debug logging environment is set in Settings.js
 
   //minify socket.io javascript
-  if(settings.minify)
-    // io.enable('browser client minification');
-
+  // Due to a shitty decision by the SocketIO team minification is
+  // no longer available, details available at:
+  // http://stackoverflow.com/questions/23981741/minify-socket-io-socket-io-js-with-1-0
+  // if(settings.minify) io.enable('browser client minification');
+  
   //Initalize the Socket.IO Router
   socketIORouter.setSocketIO(io);
   socketIORouter.addComponent("pad", padMessageHandler);
diff --git a/src/node/utils/RemoteAddress.js b/src/node/utils/RemoteAddress.js
new file mode 100644
index 000000000..86a4a5b26
--- /dev/null
+++ b/src/node/utils/RemoteAddress.js
@@ -0,0 +1 @@
+exports.remoteAddress = {};