merge

2 files changed, 10 insertions, 0 deletions

diff --git a/server/index.js b/server/index.js
index fb7f4b3..f9a104f 100644
--- a/server/index.js
+++ b/server/index.js
@@ -69,6 +69,7 @@ site.setup = function(){
 	// Essential middleware
 	// app.all('*', middleware.enableCORS);
 	app.all('*', middleware.ensureLocals);
+	app.all('*', middleware.ensureIP);
 
 	server = http.createServer(app)
 	server.listen(app.get('port'), function () {
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 7b37658..ad0d228 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -33,6 +33,15 @@ var middleware = {
 		}
 		next();
 	},
+	
+	ensureIP: function (req, res, next) {
+    if (req.ips) {
+      req.ip = req.session.ip = req.ips[0]
+    }
+    else {
+      req.ip = req.session.ip || "127.0.0.1"
+    }
+	},
 
 	ensureLocals: function (req, res, next) {
 		res.locals.token = req.csrfToken();