Merge branch 'master' into next

Author: ar2rsawseen

CHANGELOG.md

@@ -2,50 +2,55 @@
 
 **Fixes**
 
-* [crashes] improved type check
-* [ui] fixed "Email value too long" issue.
-* [slipping-away-users] fix style issue
-* [crashes] fix escaping in crash error and stacktrace
-* [events] updated compare_arrays function for events to have more checks if both passed are arrays
-* [install] fix permission issue
-* [systemlogs] fixed system logs plugin table sorting issue
-* [push] Fix for upload of APN credentials from windows / no mime-aware systems
-* [config] fixes for relative path changes
-* [db]fixed replacement of db name in mongodb connection string
-* [push] Fix for race condition in message status updates
-* [frontend] fix title if not available
-* [data-migration] log redirect url in logger
-* [logger] improve info column formatting
-* [ui] drop down fix
-* [api] deeper escaping of objects
-* [api] more error checks and handling
+* [api] added support for ports and brackets in ip addresses
+* [api] added support for partial ip address as masks in ignoreProxy config
 * [api] check correctly for finished none http requests
+* [api] deeper escaping of objects
 * [api] fixes for handling unparsable period
+* [api] more error checks and handling
 * [api] regular expression checks
-* [security] more cross site scripting preventions
-* [populator] fixed campaign session issue for web apps in populator
-* [nginx] remove server flag
+* [appmanagement] load configuration on new app(on new server)
+* [config] fixes for relative path changes
+* [crashes] fix escaping in crash error and stacktrace
+* [crashes] improve search index
+* [crashes] improved type check
+* [data-migration] log redirect url in logger
+* [db]fixed replacement of db name in mongodb connection string
+* [events] updated compare_arrays function for events to have more checks if both passed are arrays
 * [feedback] device_id fix and script for correcting data
-* [frontend] fix not using data on init for today period
 * [frontend] correctly genersate ticks for month buckets
-* [appmanagement] load configuration on new app(on new server)
+* [frontend] fix not using data on init for today period
+* [frontend] fix title if not available
+* [install] fix permission issue
+* [logger] improve info column formatting
+* [nginx] remove server flag
+* [populator] fixed campaign session issue for web apps in populator
 * [push] Deny APN app settings update if no file is selected
+* [push] Fix for race condition in message status updates
+* [push] Fix for upload of APN credentials from windows / no mime-aware systems
+* [security] more cross site scripting preventions
+* [slipping-away-users] fix style issue
+* [systemlogs] fixed system logs plugin table sorting issue
+* [ui] drop down fix
+* [ui] fixed "Email value too long" issue.
+
 
 **Enterprise fixes**
 
-* [push] Approver update
 * [drill] correctly check projection key result type
 * [drill] fix filter render bug
-* [revenue] use user estimation correction
 * [drill] fix switching bucket UI
+* [push] Approver update
+* [recaptcha] scroll fix on login screen
+* [revenue] use user estimation correction
 
 **New Features**
 * [api] support for multiple errors message
+* [server-stats] display datapoints for admins and users too
 
 **New Enterprise Features**
-* [drill] added no_map param to display plain country data
 * [dashboard] disabling sharing dashboards
-
+* [drill] added no_map param to display plain country data
 
 ## Version 18.08.1
 

api/utils/common.js

@@ -1134,20 +1134,57 @@ common.getIpAddress = function(req) {
     //if ignoreProxies not setup, use outmost left ip address
     if (!countlyConfig.ignoreProxies || !countlyConfig.ignoreProxies.length) {
         ipLogger.d("From %s found ip %s", ipAddress, ips[0]);
-        return ips[0];
+        return stripPort(ips[0]);
     }
     //search for the outmost right ip address ignoring provided proxies
     var ip = "";
     for (var i = ips.length - 1; i >= 0; i--) {
-        if (ips[i].trim() !== "127.0.0.1" && (!countlyConfig.ignoreProxies || countlyConfig.ignoreProxies.indexOf(ips[i].trim()) === -1)) {
-            ip = ips[i].trim();
+        ips[i] = stripPort(ips[i]);
+        var masks = false;
+        if (countlyConfig.ignoreProxies && countlyConfig.ignoreProxies.length) {
+            masks = countlyConfig.ignoreProxies.some(function(elem) {
+                return ips[i].startsWith(elem);
+            });
+        }
+        if (ips[i] !== "127.0.0.1" && (!countlyConfig.ignoreProxies || !masks)) {
+            ip = ips[i];
             break;
         }
     }
     ipLogger.d("From %s found ip %s", ipAddress, ip);
     return ip;
 };
 
+/**
+ *  This function takes ipv4 or ipv6 with possible port, removes port information and returns plain ip address
+ *  @param {string} ip - ip address to check for port and return plain ip
+ *  @returns {string} plain ip address
+ */
+function stripPort(ip) {
+    var parts = (ip + "").split(".");
+    //check if ipv4
+    if (parts.length === 4) {
+        return ip.split(":")[0].trim();
+    }
+    else {
+        parts = (ip + "").split(":");
+        if (parts.length === 9) {
+            parts.pop();
+        }
+        if (parts.length === 8) {
+            ip = parts.join(":");
+            //remove enclosing [] for ipv6 if they are there
+            if (ip[0] === "[") {
+                ip = ip.substring(1);
+            }
+            if (ip[ip.length - 1] === "]") {
+                ip = ip.slice(0, -1);
+            }
+        }
+    }
+    return (ip + "").trim();
+}
+
 /**
 * Modifies provided object filling properties used in zero documents in the format object["2012.7.20.property"] = increment. 
 * Usualy used when filling up Countly metric model zero document