make iputils check for existance for connection property

greggman · Jun 1, 2016 · 5d971f2 · 5d971f2
1 parent 87b2562
commit 5d971f2
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/lib/iputils.js b/lib/iputils.js
@@ -121,10 +121,16 @@ var getIpAddresses = (function() {
 }());
 
 function getRequestIpAddresses(req) {
-  var ips = req.headers['x-forwarded-for'] ||
-       req.connection.remoteAddress ||
-       req.socket.remoteAddress ||
-       req.connection.socket.remoteAddress;
+  var ips = req.headers['x-forwarded-for'];
+  if (!ips && req.connection) {
+    ips = req.connction.remoteAddress;
+  }
+  if (!ips && req.socket) {
+    ips = req.socket.remoteAddress;
+  }
+  if (!ips && req.connection && rec.connection.socket) {
+    ips = req.connection.socket.remoteAddres;
+  }
   if (ips) {
     if (ips.indexOf(',')) {
       ips = ips.split(",");
@@ -135,7 +141,7 @@ function getRequestIpAddresses(req) {
       return s.trim();
     });
   }
-  return ips && ips.length ? ips : undefined;
+  return ips && ips.length ? ips : [];
 }